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

build: make it work on somewhat older ffmpeg versions 

Tested with n0.10.4. All these version checks are rather tricky,
because Libav and FFmpeg change the same thing at slightly different
versions.
This commit is contained in:
wm4 2013-01-31 17:41:29 +01:00
parent d4246353df
commit 4a2e4b684a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compat/libav.h
View File

@ -32,7 +32,7 @@
#define AV_CODEC_ID_SUBRIP CODEC_ID_TEXT
#endif
#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 27, 0)
#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 36, 0)
#define av_get_packed_sample_fmt(x) (x)
#endif

2
stream/stream_lavf.c
View File

@ -189,7 +189,7 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
goto out;
}
#if LIBAVFORMAT_VERSION_MICRO >= 100
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 0, 0)
if (avio->av_class) {
uint8_t *mt = NULL;
if (av_opt_get(avio, "mime_type", AV_OPT_SEARCH_CHILDREN, &mt) >= 0)

2
video/fmt-conversion.c
View File

@ -133,7 +133,7 @@ static const struct {
#endif
// ffmpeg only
#if LIBAVUTIL_VERSION_MICRO >= 100
#if LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52, 0, 0)
{IMGFMT_420P12_LE, PIX_FMT_YUV420P12LE},
{IMGFMT_420P12_BE, PIX_FMT_YUV420P12BE},
{IMGFMT_420P14_LE, PIX_FMT_YUV420P14LE},