git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
965f35b
)
avformat/m4vdec: Detect raw mpeg4video with unidentified non mpeg headers with a...
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 18 Feb 2017 02:31:14 +0000
(
03:31
+0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 18 Feb 2017 03:18:30 +0000
(
04:18
+0100)
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>
libavformat/m4vdec.c
patch
|
blob
|
history
diff --git
a/libavformat/m4vdec.c
b/libavformat/m4vdec.c
index
d8ee530
..
34d434f
100644
(file)
--- 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;
}