ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Mon Dec 12 12:26:21 2016 +0100| [62eafc6a6dd8c51d6ecabdb3d649043950c4f01b] | committer: Carl Eugen Hoyos
lavf/mov: Accept multiple fourcc for AVID 1:1. Fixes ticket #5982. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62eafc6a6dd8c51d6ecabdb3d649043950c4f01b --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 0b1c182..6c8affc 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2220,6 +2220,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, if (codec_tag && (codec_tag != format && + // AVID 1:1 samples with differing data format and codec tag exist + (codec_tag != AV_RL32("AV1x") || format != AV_RL32("AVup")) && // prores is allowed to have differing data format and codec tag codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") && // so is dv (sigh) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
