diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
| commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
| tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /libmpcodecs/img_format.c | |
| parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
| parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
| download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz | |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'libmpcodecs/img_format.c')
| -rw-r--r-- | libmpcodecs/img_format.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c index f2e4bca51a..72a71b66cf 100644 --- a/libmpcodecs/img_format.c +++ b/libmpcodecs/img_format.c @@ -4,7 +4,7 @@ const char *vo_format_name(int format) { - static char unknow_format[20]; + static char unknown_format[20]; switch(format) { case IMGFMT_RGB1: return("RGB 1-bit"); @@ -68,6 +68,6 @@ const char *vo_format_name(int format) case IMGFMT_XVMC_MOCO_MPEG2: return("MPEG1/2 Motion Compensation"); case IMGFMT_XVMC_IDCT_MPEG2: return("MPEG1/2 Motion Compensation and IDCT"); } - snprintf(unknow_format,20,"Unknown 0x%04x",format); - return unknow_format; + snprintf(unknown_format,20,"Unknown 0x%04x",format); + return unknown_format; } |