From 80ac87c13dc8c6c063e26a464c5c542357c0583f Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Thu, 17 Jan 2013 14:12:44 +0100 Subject: [PATCH] lavc: support ZenoXVID custom tag Looks like this kind of samples are produced by certain Russian equipment. --- libavcodec/h263dec.c | 2 +- libavformat/riff.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index fc5f565131..7e64538198 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -441,7 +441,7 @@ retry: if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){ if(s->stream_codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || - s->codec_tag == AV_RL32("RMP4") || + s->codec_tag == AV_RL32("RMP4") || s->codec_tag == AV_RL32("ZMP4") || s->codec_tag == AV_RL32("SIPP") ) s->xvid_build= 0; diff --git a/libavformat/riff.c b/libavformat/riff.c index 95c079e561..d24231a50b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -55,6 +55,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */ + { AV_CODEC_ID_MPEG4, MKTAG('Z', 'M', 'P', '4') }, /* some broken avi use this */ { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, { AV_CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },