mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

ffmpeg: increase minimum required version to 4.4

Browse Source 
Now that 0.35 has been released, we can consider increasing our minimum
required ffmpeg version. Currently, we think 4.4 is the most recent
version we can move to (from the current requirement of 4.0).

This allows us to remove a few conditionals. There are more that we
won't be able to remove unless we move further up to 5.1.
This commit is contained in:
Philip Langdale 2022-11-29 11:16:57 -08:00 committed by Philip Langdale
parent 11229e7f71
commit 70683b8916
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demux/demux_lavf.c
View File

@ -36,9 +36,7 @@
#include <libavutil/display.h>
#include <libavutil/opt.h>
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 43, 100)
#include <libavutil/dovi_meta.h>
#endif
#include "audio/chmap_avchannel.h"
@ -745,14 +743,12 @@ static void handle_new_stream(demuxer_t *demuxer, int i)
sh->codec->rotate = (((int)(-r) % 360) + 360) % 360;
}
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 43, 100)
if ((sd = av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL))) {
const AVDOVIDecoderConfigurationRecord *cfg = (void *) sd;
MP_VERBOSE(demuxer, "Found Dolby Vision config record: profile "
"%d level %d\n", cfg->dv_profile, cfg->dv_level);
av_format_inject_global_side_data(avfc);
}
#endif
// This also applies to vfw-muxed mkv, but we can't detect these easily.
sh->codec->avi_dts = matches_avinputformat_name(priv, "avi");

14
meson.build
View File

@ -16,12 +16,12 @@ source_root = meson.project_source_root()
python = find_program('python3')
# ffmpeg
libavcodec = dependency('libavcodec', version: '>= 58.12.100')
libavfilter = dependency('libavfilter', version: '>= 7.14.100')
libavformat = dependency('libavformat', version: '>= 58.9.100')
libavutil = dependency('libavutil', version: '>= 56.12.100')
libswresample = dependency('libswresample', version: '>= 3.0.100')
libswscale = dependency('libswscale', version: '>= 5.0.101')
libavcodec = dependency('libavcodec', version: '>= 58.134.100')
libavfilter = dependency('libavfilter', version: '>= 7.110.100')
libavformat = dependency('libavformat', version: '>= 58.76.100')
libavutil = dependency('libavutil', version: '>= 56.70.100')
libswresample = dependency('libswresample', version: '>= 3.9.100')
libswscale = dependency('libswscale', version: '>= 5.9.100')
libass = dependency('libass', version: '>= 0.12.2')
pthreads = dependency('threads')
@ -631,7 +631,7 @@ if features['libarchive']
'stream/stream_libarchive.c')
endif
libavdevice = dependency('libavdevice', version: '>= 57.0.0', required: get_option('libavdevice'))
libavdevice = dependency('libavdevice', version: '>= 58.13.100', required: get_option('libavdevice'))
features += {'libavdevice': libavdevice.found()}
if features['libavdevice']
dependencies += libavdevice

2
video/mp_image.c
View File

@ -1026,11 +1026,9 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *src)
}
#endif
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 61, 100)
sd = av_frame_get_side_data(src, AV_FRAME_DATA_FILM_GRAIN_PARAMS);
if (sd)
dst->film_grain = sd->buf;
#endif
for (int n = 0; n < src->nb_side_data; n++) {
sd = src->side_data[n];

14
wscript
View File

@ -412,12 +412,12 @@ libav_dependencies = [
{
'name': 'ffmpeg',
'desc': 'FFmpeg library',
'func': check_pkg_config('libavutil', '>= 56.12.100',
'libavcodec', '>= 58.16.100',
'libavformat', '>= 58.9.100',
'libswscale', '>= 5.0.101',
'libavfilter', '>= 7.14.100',
'libswresample', '>= 3.0.100'),
'func': check_pkg_config('libavutil', '>= 56.70.100',
'libavcodec', '>= 58.134.100',
'libavformat', '>= 58.76.100',
'libswscale', '>= 5.9.100',
'libavfilter', '>= 7.110.100',
'libswresample', '>= 3.9.100'),
'req': True,
'fmsg': "Unable to find development files for some of the required \
FFmpeg libraries. Git master is recommended."
@ -428,7 +428,7 @@ FFmpeg libraries. Git master is recommended."
}, {
'name': '--libavdevice',
'desc': 'libavdevice',
'func': check_pkg_config('libavdevice', '>= 57.0.0'),
'func': check_pkg_config('libavdevice', '>= 58.13.100'),
}
]