summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-13 12:47:19 +0100
committerwm4 <wm4@nowhere>2012-12-13 12:49:27 +0100
commit61aef3fff983416b06d7141bea5d75ec63b32bb9 (patch)
treed7fa0c20f6c2451fe07003667ef1919f0d5b32b7 /demux
parentc3f8c9a58e3028777466ce0d3f56374efb10f968 (diff)
downloadmpv-61aef3fff983416b06d7141bea5d75ec63b32bb9.tar.bz2
mpv-61aef3fff983416b06d7141bea5d75ec63b32bb9.tar.xz
Fix compilation with ffmpeg 1.0
AVPROBE_SCORE_RETRY was too new, and doesn't even exist in Libav. Go back to using the value explicitly.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_lavf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 7c73ac6085..552a9e8366 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -239,10 +239,10 @@ static int lavf_check_file(demuxer_t *demuxer)
goto success;
}
- // AVPROBE_SCORE_RETRY + 1 is the "recommended" limit. Below that, the user
+ // AVPROBE_SCORE_MAX/4 + 1 is the "recommended" limit. Below that, the user
// is supposed to retry with larger probe sizes until a higher value is
// reached.
- int min_probe = AVPROBE_SCORE_RETRY + 1;
+ int min_probe = AVPROBE_SCORE_MAX/4 + 1;
if (lavfdopts->probescore)
min_probe = lavfdopts->probescore;