[FFmpeg-cvslog] avformat/m4vdec: Detect raw mpeg4video with unidentified non mpeg headers with a very low score

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Feb 18 03:31:14 2017 +0100| [6baee21eb72ddbd2508ef789ecdcd938419df3a4] | committer: Michael Niedermayer

avformat/m4vdec: Detect raw mpeg4video with unidentified non mpeg headers with a very low score

Fixes Ticket 6018

This fixes a regression, and allows playback of files containing mpeg4video that are otherwise
not supported

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6baee21eb72ddbd2508ef789ecdcd938419df3a4
---

 libavformat/m4vdec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index d8ee530..34d434f 100644
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -53,6 +53,9 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
 
     if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res == 0)
         return VOP+VO > 4 ? AVPROBE_SCORE_EXTENSION : AVPROBE_SCORE_EXTENSION/2;
+
+    if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && VOP+VO > 4)
+        return AVPROBE_SCORE_EXTENSION/10;
     return 0;
 }