Merge remote branch 'qatar/master'

[ffmpeg] / libavformat / m4vdec.c

diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index fdd3a808c65863d49cca888bfc83697080f00adb..f830c7afcf72bfc52a0607dd6eed4ff7ffc6b5e5 100644 (file)
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -45,11 +45,11 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
     }
 
     if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0)
-        return AVPROBE_SCORE_MAX/2;
+        return VOP+VO > 3 ? AVPROBE_SCORE_MAX/2 : AVPROBE_SCORE_MAX/4;
     return 0;
 }
 
-AVInputFormat m4v_demuxer = {
+AVInputFormat ff_m4v_demuxer = {
     "m4v",
     NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     0,