Mercurial > libavcodec.hg

changeset 7816:e4b066e695b1 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: s/short/int16_t/
author vitor
date Sun, 07 Sep 2008 14:33:01 +0000
parents 275e43fa3dcb
children 0f3b77f8789d
files mace.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mace.c	Sun Sep 07 14:32:10 2008 +0000
+++ b/mace.c	Sun Sep 07 14:33:01 2008 +0000
@@ -237,7 +237,7 @@
 #define QT_8S_2_16S(x) (((x) & 0xFF00) | (((x) >> 8) & 0xFF))
 
 typedef struct ChannelData {
-    short index, lev, factor, prev2, previous, level;
+    int16_t index, lev, factor, prev2, previous, level;
 } ChannelData;
 
 typedef struct MACEContext {
@@ -263,7 +263,7 @@
                    const int16_t *tab2, int tab2_stride,
                    uint32_t numChannels)
 {
-    short current;
+    int16_t current;
 
     current = tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val];
 
@@ -280,7 +280,7 @@
                    const int16_t *tab2, int tab2_stride,
                    uint32_t numChannels)
 {
-    short current;
+    int16_t current;
 
     current = tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val];
 
@@ -321,7 +321,7 @@
                               void *data, int *data_size,
                               const uint8_t *buf, int buf_size)
 {
-    short *samples = data;
+    int16_t *samples = data;
     MACEContext *ctx = avctx->priv_data;
     int i, j, k;
 
@@ -352,7 +352,7 @@
                               void *data, int *data_size,
                               const uint8_t *buf, int buf_size)
 {
-    short *samples = data;
+    int16_t *samples = data;
     MACEContext *ctx = avctx->priv_data;
     int i, j;