From 47313bbb5f52815e7e9bc20c0ddc747facf81845 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 4 Jun 2014 21:44:49 +0200 Subject: avcodec/dcadec: remove fishy FFMAX() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These where intended to maintain the previous behavior before dca_dmix_code() but it is unclear (to me) which way is correct and no sample seem to trigger the case, also they are incomplete for the purprose of error checking Found-by: Niels Möller Signed-off-by: Michael Niedermayer --- libavcodec/dcadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/dcadec.c') diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index e23155c..9f6edc2 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -601,7 +601,7 @@ static int dca_parse_audio_coding_header(DCAContext *s, int base_channel, if (get_bits1(&s->gb)) { embedded_downmix = get_bits1(&s->gb); coeff = get_bits(&s->gb, 6); - scale_factor = -1.0f / dca_dmix_code(FFMAX(coeff<<2, 4)-3); + scale_factor = -1.0f / dca_dmix_code((coeff<<2)-3); s->xxch_dmix_sf[s->xxch_chset] = scale_factor; @@ -622,7 +622,7 @@ static int dca_parse_audio_coding_header(DCAContext *s, int base_channel, coeff = get_bits(&s->gb, 7); ichan = dca_xxch2index(s, 1 << i); - s->xxch_dmix_coeff[j][ichan] = dca_dmix_code(FFMAX(coeff<<2, 3)-3); + s->xxch_dmix_coeff[j][ichan] = dca_dmix_code((coeff<<2)-3); } } } -- cgit v1.1