[FFmpeg-cvslog] Do not ask for samples if a specific channel layout was requested.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon May 23 01:23:33 2011 +0200| [0753721ed1caab048b58db15ebfdf45569e83420] | committer: Carl Eugen Hoyos

Do not ask for samples if a specific channel layout was requested.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0753721ed1caab048b58db15ebfdf45569e83420
---

 libavcodec/mlpdec.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 50826d0..b13d079 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.");