aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-31 22:55:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-31 22:55:15 +0100
commit0d17477e2c7c3eec87d715b42d33eca4089ada6f (patch)
treeb36f67393fadded2328d951b2da53860ccfb3ddf /libavcodec
parentc8eba9f9d56ed47f4e50793f975532697cbd07b7 (diff)
parentbfbd22f9f01aa859f046ed019d6bc79daa4b1feb (diff)
downloadffmpeg-0d17477e2c7c3eec87d715b42d33eca4089ada6f.tar.gz
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall: Cosmetics: Fix some whitespace errors and indentation Use correct variable type for 32-bit samples buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/wmalosslessdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 3f23b66002..4b0a68b2d5 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?