diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libmpdemux/demux_ty_osd.c | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libmpdemux/demux_ty_osd.c')
-rw-r--r-- | libmpdemux/demux_ty_osd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index db9911c865..56d5d7459a 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -574,14 +574,14 @@ static char TY_XDS [ 8 ][ 25 ][ 34 ]; static char TY_XDS_new[ 8 ][ 25 ][ 34 ]; // Array of [ MPAARating|TVRating ][ NumberRatings ] -static const char const *TY_XDS_CHIP[ 2 ][ 8 ] = +static const char * const TY_XDS_CHIP[ 2 ][ 8 ] = { { "(NOT APPLICABLE)", "G", "PG", "PG-13", "R", "NC-17", "X", "(NOT RATED)" }, { "(NOT RATED)", "TV-Y", "TV-Y7", "TV-G", "TV-PG", "TV-14", "TV-MA", "(NOT RATED)" } }; -static const char const *TY_XDS_modes[] = +static const char * const TY_XDS_modes[] = { "CURRENT", // 01h-02h current program "FUTURE ", // 03h-04h future program |