Browse Source

adx: rename struct PREV to ADXChannelState

tags/n0.9
Justin Ruggles 14 years ago
parent
commit
dd1b9f7cd9
3 changed files with 8 additions and 5 deletions
  1. +2
    -2
      libavcodec/adx.h
  2. +4
    -2
      libavcodec/adxdec.c
  3. +2
    -1
      libavcodec/adxenc.c

+ 2
- 2
libavcodec/adx.h View File

@@ -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;


+ 4
- 2
libavcodec/adxdec.c View File

@@ -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;


+ 2
- 1
libavcodec/adxenc.c View File

@@ -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;


Loading…
Cancel
Save