From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sat, 19 Nov 2011 22:05:44 +0000 (-0500)
Subject: adx: rename struct PREV to ADXChannelState
X-Git-Tag: android-x86-4.4-r1~8529^2~4441
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd1b9f7cd9d80ae5aa691eadbee6315919a91341;p=android-x86%2Fexternal-ffmpeg.git

adx: rename struct PREV to ADXChannelState
---

diff --git a/libavcodec/adx.h b/libavcodec/adx.h
index c4206963d5..bba09aed8b 100644
--- a/libavcodec/adx.h
+++ b/libavcodec/adx.h
@@ -33,10 +33,10 @@
 
 typedef struct {
     int s1,s2;
-} PREV;
+} ADXChannelState;
 
 typedef struct {
-    PREV prev[2];
+    ADXChannelState prev[2];
     int header_parsed;
     unsigned char dec_temp[18*2];
     int in_temp;
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index 79fcf13c31..0a9e60118e 100644
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -40,7 +40,8 @@ static av_cold int adx_decode_init(AVCodecContext *avctx)
 
 /* 18 bytes <-> 32 samples */
 
-static void adx_decode(short *out,const unsigned char *in,PREV *prev)
+static void adx_decode(short *out,const unsigned char *in,
+                       ADXChannelState *prev)
 {
     int scale = AV_RB16(in);
     int i;
@@ -73,7 +74,8 @@ static void adx_decode(short *out,const unsigned char *in,PREV *prev)
 
 }
 
-static void adx_decode_stereo(short *out,const unsigned char *in,PREV *prev)
+static void adx_decode_stereo(short *out,const unsigned char *in,
+                              ADXChannelState *prev)
 {
     short tmp[32*2];
     int i;
diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index 61ba07a35d..fde0b8239e 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -34,7 +34,8 @@
 
 /* 18 bytes <-> 32 samples */
 
-static void adx_encode(unsigned char *adx,const short *wav,PREV *prev)
+static void adx_encode(unsigned char *adx,const short *wav,
+                       ADXChannelState *prev)
 {
     int scale;
     int i;