summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 14:50:23 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 14:50:23 +0000
commit9cb59032998e695c30031e99a1b410b039cb1902 (patch)
tree8d5853b424c286c03dfcf2d4c30af2a0bacf898e /libavcodec
parent2be209b21328d178d5ef45c9ad0ba8ed7c5eb306 (diff)
cosmetics: change all short to int16_t
Originally committed as revision 25947 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ac3enc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 24fd022b94..1bc1439e69 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -70,7 +70,7 @@ typedef struct AC3EncodeContext {
/* mantissa encoding */
int mant1_cnt, mant2_cnt, mant4_cnt;
- short last_samples[AC3_MAX_CHANNELS][256];
+ int16_t last_samples[AC3_MAX_CHANNELS][256];
} AC3EncodeContext;
static int16_t costab[64];
@@ -96,7 +96,7 @@ static inline int16_t fix15(float a)
}
typedef struct IComplex {
- short re,im;
+ int16_t re,im;
} IComplex;
static av_cold void fft_init(int ln)
@@ -1384,7 +1384,7 @@ void test_ac3(void)
{
AC3EncodeContext ctx;
unsigned char frame[AC3_MAX_CODED_FRAME_SIZE];
- short samples[AC3_FRAME_SIZE];
+ int16_t samples[AC3_FRAME_SIZE];
int ret, i;
AC3_encode_init(&ctx, 44100, 64000, 1);