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 | |
| parent | da6ec7203dcc8d615d78f7eea6369d37272bb37c (diff) | |
| download | ffmpeg-c2ca19d7f914c2856b373a088c6d1b5b607b3475.tar.gz | |
RMP4 ("xvid fork") decoding support
Originally committed as revision 5035 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263dec.c | 3 | ||||
| -rw-r--r-- | libavformat/avienc.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 87c9e4991b..ac22bca8ef 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 diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 8718b8ff94..3900799ad0 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -108,6 +108,8 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, + { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, + { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3'), .invalid_asf = 1 }, /* default signature when using MSMPEG4 */ { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, |