mirror of https://git.ffmpeg.org/ffmpeg.git
RMP4 ("xvid fork") decoding support
Originally committed as revision 5035 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
da6ec7203d
commit
c2ca19d7f9
|
@ -514,7 +514,8 @@ retry:
|
||||||
|
|
||||||
if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){
|
if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){
|
||||||
if(s->avctx->stream_codec_tag == ff_get_fourcc("XVID") ||
|
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;
|
s->xvid_build= -1;
|
||||||
#if 0
|
#if 0
|
||||||
if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1
|
if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1
|
||||||
|
|
|
@ -108,6 +108,8 @@ const CodecTag codec_bmp_tags[] = {
|
||||||
{ CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') },
|
{ CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') },
|
||||||
{ CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') },
|
{ 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('D', 'I', 'V', '3'), .invalid_asf = 1 }, /* default signature when using MSMPEG4 */
|
||||||
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
|
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue