From 6ca1016b3afc37fb34d4768698da9aa4e5f9c351 Mon Sep 17 00:00:00 2001 From: Mashiat Sarker Shakkhar Date: Sun, 22 Jan 2012 17:49:19 +0600 Subject: [PATCH 1/2] Use correct variable type for 32-bit samples buffer --- libavcodec/wmalosslessdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index c623f4ee5a..25fdd8fefa 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -202,8 +202,8 @@ typedef struct WmallDecodeCtx { int buf_bit_size; ///< buffer size in bits int16_t* samples_16; ///< current samplebuffer pointer (16-bit) int16_t* samples_16_end; ///< maximum samplebuffer pointer - int16_t* samples_32; ///< current samplebuffer pointer (24-bit) - int16_t* samples_32_end; ///< maximum samplebuffer pointer + int *samples_32; ///< current samplebuffer pointer (24-bit) + int *samples_32_end; ///< maximum samplebuffer pointer uint8_t drc_gain; ///< gain for the DRC tool int8_t skip_frame; ///< skip output step int8_t parsed_all_subframes; ///< all subframes decoded? From bfbd22f9f01aa859f046ed019d6bc79daa4b1feb Mon Sep 17 00:00:00 2001 From: Mashiat Sarker Shakkhar Date: Fri, 27 Jan 2012 01:14:12 -0800 Subject: [PATCH 2/2] Cosmetics: Fix some whitespace errors and indentation --- libavcodec/wmalosslessdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 25fdd8fefa..d5ee9b5b5c 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -224,7 +224,7 @@ typedef struct WmallDecodeCtx { WmallChannelCtx channel[WMALL_MAX_CHANNELS]; ///< per channel data // WMA lossless - + uint8_t do_arith_coding; uint8_t do_ac_filter; uint8_t do_inter_ch_decorr; @@ -583,7 +583,7 @@ static int my_log2(unsigned int i) { unsigned int iLog2 = 0; while ((i >> iLog2) > 1) - iLog2++; + iLog2++; return iLog2; } @@ -598,7 +598,7 @@ static void decode_ac_filter(WmallDecodeCtx *s) s->acfilter_scaling = get_bits(&s->gb, 4); for(i = 0; i < s->acfilter_order; i++) { - s->acfilter_coeffs[i] = get_bits(&s->gb, s->acfilter_scaling) + 1; + s->acfilter_coeffs[i] = get_bits(&s->gb, s->acfilter_scaling) + 1; } }