[FFmpeg-cvslog] Fix mpeg-ps misdetected as m4v.

Michael Niedermayer git at videolan.org
Sun Apr 3 18:20:09 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 10 10:32:46 2011 +0100| [2ee453610fafb83f1442d764c75554d83508cdb5] | committer: Michael Niedermayer

Fix mpeg-ps misdetected as m4v.
Fix issue2326

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/m4vdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index 4b0154e..f830c7a 100644
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -45,7 +45,7 @@ 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;
 }
 



More information about the ffmpeg-cvslog mailing list