virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2011-05-23 01:23:33 +02:00
parent 458f20bc75
commit 0753721ed1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mlpdec.c
View File

@ -340,6 +340,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1); m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1);
} }
if (m->avctx->channels && 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) { av_get_channel_layout_nb_channels(m->avctx->channel_layout) != m->avctx->channels) {
m->avctx->channel_layout = 0; m->avctx->channel_layout = 0;
av_log_ask_for_sample(m->avctx, "Unknown channel layout."); av_log_ask_for_sample(m->avctx, "Unknown channel layout.");