diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-20 04:13:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-20 04:20:36 +0100 |
| commit | 61f40fbb528d6e25b78ce673826388e3493155c4 (patch) | |
| tree | ba692da08ed0030826e98077fa7555142c530289 /libavcodec/ac3dec.c | |
| parent | df87cfd798d102381b105c67cd9ae9a22a659cc7 (diff) | |
| parent | ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79 (diff) | |
| download | ffmpeg-61f40fbb528d6e25b78ce673826388e3493155c4.tar.gz | |
Merge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79'
* commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79':
ac3dec: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 1603f4f426..28157af0da 100644 --- 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; } s->downmixed = 1; |