diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-18 03:31:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-18 04:18:30 +0100 |
| commit | 6baee21eb72ddbd2508ef789ecdcd938419df3a4 (patch) | |
| tree | 752c26a058f2e1313d6f13e3c55651ae7e9b665b /libavformat/m4vdec.c | |
| parent | 965f35b111a0b8871f361b2de09dac339d87e7fb (diff) | |
| download | ffmpeg-6baee21eb72ddbd2508ef789ecdcd938419df3a4.tar.gz | |
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@niedermayer.cc>
Diffstat (limited to 'libavformat/m4vdec.c')
| -rw-r--r-- | libavformat/m4vdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c index d8ee530010..34d434f7d2 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; } |