summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg/A03-truehd-downmix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ffmpeg/A03-truehd-downmix.patch')
-rw-r--r--contrib/ffmpeg/A03-truehd-downmix.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/contrib/ffmpeg/A03-truehd-downmix.patch b/contrib/ffmpeg/A03-truehd-downmix.patch
deleted file mode 100644
index 9a9c18e13..000000000
--- a/contrib/ffmpeg/A03-truehd-downmix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
-index 0eaf2e3..ef1812d 100644
---- a/libavcodec/mlpdec.c
-+++ b/libavcodec/mlpdec.c
-@@ -445,14 +445,24 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
- return AVERROR_INVALIDDATA;
- }
-
-- if (m->avctx->request_channels > 0
-- && s->max_channel + 1 >= m->avctx->request_channels
-- && substr < m->max_decoded_substream) {
-+#if FF_API_REQUEST_CHANNELS
-+ if (m->avctx->request_channels > 0 &&
-+ m->avctx->request_channels <= s->max_channel + 1 &&
-+ m->max_decoded_substream > substr) {
- av_log(m->avctx, AV_LOG_DEBUG,
-- "Extracting %d channel downmix from substream %d. "
-+ "Extracting %d-channel downmix from substream %d. "
- "Further substreams will be skipped.\n",
- s->max_channel + 1, substr);
- m->max_decoded_substream = substr;
-+ } else
-+#endif
-+ if (m->avctx->request_channel_layout == s->ch_layout &&
-+ m->max_decoded_substream > substr) {
-+ av_log(m->avctx, AV_LOG_DEBUG,
-+ "Extracting %d-channel downmix (0x%"PRIx64") from substream %d. "
-+ "Further substreams will be skipped.\n",
-+ s->max_channel + 1, s->ch_layout, substr);
-+ m->max_decoded_substream = substr;
- }
-
- s->noise_shift = get_bits(gbp, 4);