diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2006-02-19 10:20:27 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2006-02-19 10:20:27 +0000 |
commit | c2ca19d7f914c2856b373a088c6d1b5b607b3475 (patch) | |
tree | 5c83795f4bb61eee30b18448ce5173a956397204 /libavcodec/h263dec.c | |
parent | da6ec7203dcc8d615d78f7eea6369d37272bb37c (diff) | |
download | ffmpeg-streaming-c2ca19d7f914c2856b373a088c6d1b5b607b3475.zip ffmpeg-streaming-c2ca19d7f914c2856b373a088c6d1b5b607b3475.tar.gz |
RMP4 ("xvid fork") decoding support
Originally committed as revision 5035 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r-- | libavcodec/h263dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 87c9e49..ac22bca 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -514,7 +514,8 @@ retry: if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ if(s->avctx->stream_codec_tag == ff_get_fourcc("XVID") || - s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX")) + s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX") || + s->avctx->codec_tag == ff_get_fourcc("RMP4")) s->xvid_build= -1; #if 0 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 |