From 0753721ed1caab048b58db15ebfdf45569e83420 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 23 May 2011 01:23:33 +0200 Subject: Do not ask for samples if a specific channel layout was requested. --- libavcodec/mlpdec.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavcodec') diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 50826d0ff5..b13d0795cd 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -340,6 +340,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1); } if (m->avctx->channels && + !m->avctx->request_channels && !m->avctx->request_channel_layout && av_get_channel_layout_nb_channels(m->avctx->channel_layout) != m->avctx->channels) { m->avctx->channel_layout = 0; av_log_ask_for_sample(m->avctx, "Unknown channel layout."); -- cgit v1.2.3