diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d /codec-cfg.h | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'codec-cfg.h')
| -rw-r--r-- | codec-cfg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/codec-cfg.h b/codec-cfg.h index 982f37752e..d964ef74db 100644 --- a/codec-cfg.h +++ b/codec-cfg.h @@ -3,7 +3,7 @@ #define CODEC_CFG_MIN 20070407 -#define CODECS_MAX_FOURCC 32 +#define CODECS_MAX_FOURCC 92 #define CODECS_MAX_OUTFMT 16 #define CODECS_MAX_INFMT 16 |