[FFmpeg-cvslog] dcadec: simplify an expression

Tim Walker git at videolan.org
Tue Nov 19 04:10:06 CET 2013


ffmpeg | branch: master | Tim Walker <tdskywalker at gmail.com> | Mon Nov 18 12:41:43 2013 +0100| [37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9] | committer: Diego Biurrun

dcadec: simplify an expression

Signed-off-by: Diego Biurrun <diego at biurrun.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9
---

 libavcodec/dcadec.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index c80bd81..7af5e5c 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1922,8 +1922,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;
     }
 



More information about the ffmpeg-cvslog mailing list