On Sun, Nov 17, 2013 at 12:14:28AM +0100, Tim Walker wrote:
> --- a/libavcodec/ac3dec.c
> +++ b/libavcodec/ac3dec.c
> @@ -178,9 +178,8 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
> avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
>
> /* allow downmixing to stereo or mono */
> - if (avctx->channels > 0 && avctx->request_channels > 0 &&
> - avctx->request_channels < avctx->channels &&
> - avctx->request_channels <= 2) {
> + if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
> + avctx->request_channels < avctx->channels) {
> avctx->channels = avctx->request_channels;
OK
> @@ -1350,7 +1349,7 @@ static int ac3_decode_frame(AVCodecContext * avctx,
> void *data,
> if (s->lfe_on)
> s->output_mode |= AC3_OUTPUT_LFEON;
> if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
> - avctx->request_channels < s->channels) {
> + avctx->request_channels < s->channels) {
unrelated
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
