diff options
| author | Philip Langdale <philipl@overt.org> | 2022-11-29 11:16:57 -0800 |
|---|---|---|
| committer | Philip Langdale <github.philipl@overt.org> | 2022-12-01 10:45:47 -0800 |
| commit | 70683b891672aba401c111e4afc599ca230d7314 (patch) | |
| tree | 68a6cf5f899498c9cf0081b7278a61f9ec786c9b /demux | |
| parent | 11229e7f7177220dd1607625a3a1bfc9d34a5f51 (diff) | |
| download | mpv-70683b891672aba401c111e4afc599ca230d7314.tar.bz2 mpv-70683b891672aba401c111e4afc599ca230d7314.tar.xz | |
ffmpeg: increase minimum required version to 4.4
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.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_lavf.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 22e6531f8b..2b65471b02 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -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"); |