OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a553c6a
)
dcadec: simplify an expression
author
Tim Walker
<tdskywalker@gmail.com>
Mon, 18 Nov 2013 11:41:43 +0000
(12:41 +0100)
committer
Diego Biurrun
<diego@biurrun.de>
Tue, 19 Nov 2013 01:02:49 +0000
(
02:02
+0100)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
libavcodec/dcadec.c
patch
|
blob
|
history
diff --git
a/libavcodec/dcadec.c
b/libavcodec/dcadec.c
index
c80bd81
..
7af5e5c
100644
(file)
--- 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;
}