Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / m4vdec.c

diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index 4b0154edcdf2b6448a5e167c62fd314efa8f3899..88f838022e67362de755262b24f4924179dbe8ca 100644 (file)
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -45,18 +45,8 @@ 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 ff_m4v_demuxer = {
-    "m4v",
-    NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
-    0,
-    mpeg4video_probe, /** probing for MPEG-4 data */
-    ff_raw_video_read_header,
-    ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "m4v",
-    .value = CODEC_ID_MPEG4,
-};
+FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video format", mpeg4video_probe, "m4v", CODEC_ID_MPEG4)