highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9'

Browse Source 
* commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9':
  dcadec: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-19 04:02:41 +01:00
parent 56e122787e 37a3cac78c
commit 8540368582
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/dcadec.c
View File

@@ -2480,8 +2480,7 @@ static av_cold int dca_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
/* allow downmixing to stereo */ /* allow downmixing to stereo */
if (avctx->channels > 0 && avctx->request_channels < avctx->channels && if (avctx->channels > 2 && avctx->request_channels == 2) {
avctx->request_channels == 2) {
avctx->channels = avctx->request_channels; avctx->channels = avctx->request_channels;
} }