[FFmpeg-cvslog] adx: rename struct PREV to ADXChannelState
Justin Ruggles
git at videolan.org
Sun Nov 27 00:39:13 CET 2011
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Nov 19 17:05:44 2011 -0500| [dd1b9f7cd9d80ae5aa691eadbee6315919a91341] | committer: Justin Ruggles
adx: rename struct PREV to ADXChannelState
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd1b9f7cd9d80ae5aa691eadbee6315919a91341
---
libavcodec/adx.h | 4 ++--
libavcodec/adxdec.c | 6 ++++--
libavcodec/adxenc.c | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/libavcodec/adx.h b/libavcodec/adx.h
index c420696..bba09ae 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 79fcf13..0a9e601 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 61ba07a..fde0b82 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;
More information about the ffmpeg-cvslog
mailing list