generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dpcm: move codec-specific variable declarations to their corresponding decoding blocks.

Browse Source
This commit is contained in:
Justin Ruggles 2011-09-11 12:13:13 -04:00
parent 989bb7bd04
commit fc6faee0d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dpcm.c
View File

@ -175,8 +175,6 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
int ch = 0; int ch = 0;
int stereo = s->channels - 1; int stereo = s->channels - 1;
short *output_samples = data; short *output_samples = data;
int shift[2];
short diff;
if (!buf_size) if (!buf_size)
return 0; return 0;
@ -253,8 +251,9 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
break; break;
case CODEC_ID_XAN_DPCM: case CODEC_ID_XAN_DPCM:
{
int shift[2] = { 4, 4 };
in = 0; in = 0;
shift[0] = shift[1] = 4;
predictor[0] = AV_RL16(&buf[in]); predictor[0] = AV_RL16(&buf[in]);
in += 2; in += 2;
SE_16BIT(predictor[0]); SE_16BIT(predictor[0]);
@ -266,7 +265,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
while (in < buf_size) { while (in < buf_size) {
uint8_t n = buf[in++]; uint8_t n = buf[in++];
diff = (n & 0xFC) << 8; int16_t diff = (n & 0xFC) << 8;
if ((n & 0x03) == 3) if ((n & 0x03) == 3)
shift[ch]++; shift[ch]++;
else else
@ -285,6 +284,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
ch ^= stereo; ch ^= stereo;
} }
break; break;
}
case CODEC_ID_SOL_DPCM: case CODEC_ID_SOL_DPCM:
in = 0; in = 0;
if (avctx->codec_tag != 3) { if (avctx->codec_tag != 3) {