From 61aef3fff983416b06d7141bea5d75ec63b32bb9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 13 Dec 2012 12:47:19 +0100 Subject: 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. --- compat/libav.h | 4 ---- demux/demux_lavf.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/compat/libav.h b/compat/libav.h index 6546a76755..9dd0ee7887 100644 --- a/compat/libav.h +++ b/compat/libav.h @@ -40,10 +40,6 @@ #define avcodec_free_frame av_freep #endif -#if LIBAVFORMAT_VERSION_MICRO < 100 -#define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4) -#endif - // For Libav 0.9 #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 2, 100) #define AV_DISPOSITION_ATTACHED_PIC 0x0400 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; -- cgit v1.2.3