RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2012-12-13 12:47:19 +01:00
parent c3f8c9a58e
commit 61aef3fff9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compat/libav.h
View File

@ -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

4
demux/demux_lavf.c
View File

@ -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;