diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-05-23 01:23:33 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-05-23 01:23:33 +0200 |
| commit | 0753721ed1caab048b58db15ebfdf45569e83420 (patch) | |
| tree | 07f6016993e4ea7d595ed498c4aee3325ab78371 /libavcodec | |
| parent | 458f20bc75f9bf7615c65d30296071a69f1660e9 (diff) | |
Do not ask for samples if a specific channel layout was requested.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mlpdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
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."); |