diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 04:02:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 04:09:03 +0100 |
| commit | 8540368582fe44df3971eaff311dcc844b5d8609 (patch) | |
| tree | 2fdd52a3d365df661d7eec0792e7939cac8bc63a /libavcodec/dcadec.c | |
| parent | 56e122787e7362274b7ac342fde6e303259a5f57 (diff) | |
| parent | 37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9 (diff) | |
Merge commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9'
* commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9':
dcadec: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 613e60b02a..bb47ebc142 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2480,8 +2480,7 @@ static av_cold int dca_decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; /* allow downmixing to stereo */ - if (avctx->channels > 0 && avctx->request_channels < avctx->channels && - avctx->request_channels == 2) { + if (avctx->channels > 2 && avctx->request_channels == 2) { avctx->channels = avctx->request_channels; } |