diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-10 10:32:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 16:40:12 +0200 |
| commit | 2ee453610fafb83f1442d764c75554d83508cdb5 (patch) | |
| tree | 8b1a4d1bf0e4fcb14c867f24cb62621616b2b690 /libavformat/m4vdec.c | |
| parent | 19457a5d4a4bd25783a6a7fb665eb509a693eb2e (diff) | |
| download | ffmpeg-2ee453610fafb83f1442d764c75554d83508cdb5.tar.gz | |
Fix mpeg-ps misdetected as m4v.
Fix issue2326
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/m4vdec.c')
| -rw-r--r-- | libavformat/m4vdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c index 4b0154edcd..f830c7afcf 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; } |