On 01/22/2013 03:53 PM, Tim Walker wrote:
> This is unnecessary, as ff_flac_set_channel_layout can handle any number of
> channels.
> ---
> libavcodec/flac_parser.c | 2 +-
> libavcodec/flacdec.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
> index 3d8e17f..ee92ee3 100644
> --- a/libavcodec/flac_parser.c
> +++ b/libavcodec/flac_parser.c
> @@ -458,7 +458,7 @@ static int get_best_header(FLACParseContext* fpc, const
> uint8_t **poutbuf,
> }
>
> 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;
> ff_flac_set_channel_layout(fpc->avctx);
> }
> diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
> index 51fd196..f273d14 100644
> --- a/libavcodec/flacdec.c
> +++ b/libavcodec/flacdec.c
> @@ -426,7 +426,7 @@ static int decode_frame(FLACContext *s)
> return ret;
> }
> 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);
> s->ch_mode = fi.ch_mode;
>
LGTM
-Justin
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
