From 489f050fafa19ab0d8c47e6e8abca45f4fda9784 Mon Sep 17 00:00:00 2001 From: derrod Date: Sun, 18 Aug 2024 09:18:37 +0200 Subject: [PATCH] win-dshow: Remove compatibility with FFmpeg < 6.1 --- plugins/win-dshow/ffmpeg-decode.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/plugins/win-dshow/ffmpeg-decode.c b/plugins/win-dshow/ffmpeg-decode.c index e5ba5ea4f..9cd611866 100644 --- a/plugins/win-dshow/ffmpeg-decode.c +++ b/plugins/win-dshow/ffmpeg-decode.c @@ -92,11 +92,6 @@ int ffmpeg_decode_init(struct ffmpeg_decode *decode, enum AVCodecID id, return ret; } -#if LIBAVCODEC_VERSION_MAJOR < 60 - if (decode->codec->capabilities & CODEC_CAP_TRUNC) - decode->decoder->flags |= CODEC_FLAG_TRUNC; -#endif - return 0; } @@ -265,13 +260,8 @@ bool ffmpeg_decode_audio(struct ffmpeg_decode *decode, uint8_t *data, audio->samples_per_sec = decode->frame->sample_rate; audio->format = convert_sample_format(decode->frame->format); -#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 24, 100) - audio->speakers = - convert_speaker_layout((uint8_t)decode->decoder->channels); -#else audio->speakers = convert_speaker_layout( (uint8_t)decode->decoder->ch_layout.nb_channels); -#endif audio->frames = decode->frame->nb_samples;