virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

flac: don't check the number of channels before setting the channel layout.

Browse Source 
This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Tim Walker 2013-01-22 21:53:53 +01:00 committed by Anton Khirnov
parent a846dccb29
commit 41244e13d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/flac_parser.c
View File

@ -458,7 +458,7 @@ static int get_best_header(FLACParseContext* fpc, const uint8_t **poutbuf,
} }
if (header->fi.channels != fpc->avctx->channels || if (header->fi.channels != fpc->avctx->channels ||
(!fpc->avctx->channel_layout && header->fi.channels <= 6)) { !fpc->avctx->channel_layout) {
fpc->avctx->channels = header->fi.channels; fpc->avctx->channels = header->fi.channels;
ff_flac_set_channel_layout(fpc->avctx); ff_flac_set_channel_layout(fpc->avctx);
} }

2
libavcodec/flacdec.c
View File

@ -426,7 +426,7 @@ static int decode_frame(FLACContext *s)
return ret; return ret;
} }
s->channels = s->avctx->channels = fi.channels; s->channels = s->avctx->channels = fi.channels;
if (!s->avctx->channel_layout && s->channels <= 6) if (!s->avctx->channel_layout)
ff_flac_set_channel_layout(s->avctx); ff_flac_set_channel_layout(s->avctx);
s->ch_mode = fi.ch_mode; s->ch_mode = fi.ch_mode;