Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlpdec: supress layout mismatch warnings for 2 ch upmixed mono

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
release/1.0
Michael Niedermayer 13 years ago
parent eda5db6bd1
commit c5e2347373
1 changed files with 2 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/mlpdec.c

2
libavcodec/mlpdec.c
Unescape View File

@ -340,6 +340,8 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
if (m->avctx->channels<=2 && m->avctx->channel_layout == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) { if (m->avctx->channels<=2 && m->avctx->channel_layout == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) {
av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n"); av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n");
m->max_decoded_substream = 0; m->max_decoded_substream = 0;
if (m->avctx->channels==2)
m->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} }
if (m->avctx->channels && if (m->avctx->channels &&
!m->avctx->request_channels && !m->avctx->request_channel_layout && !m->avctx->request_channels && !m->avctx->request_channel_layout &&

Write Preview
Loading…
Cancel
Save