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

do not use a variable before proper initialization

Browse Source 
Originally committed as revision 4009 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mike Melanson 2005-03-06 06:22:24 +00:00
parent 6d6d7970e7
commit 7ff85a81ed
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/alac.c
View File

@ -97,7 +97,7 @@ static void allocate_buffers(alac_file *alac)
void alac_set_info(alac_file *alac, char *inputbuffer) void alac_set_info(alac_file *alac, char *inputbuffer)
{ {
char *ptr = inputbuffer; unsigned char *ptr = inputbuffer;
ptr += 4; /* size */ ptr += 4; /* size */
ptr += 4; /* alac */ ptr += 4; /* alac */
@ -134,7 +134,7 @@ static uint32_t readbits_16(alac_file *alac, int bits)
if (alac->input_buffer_index + 2 >= alac->input_buffer_size) { if (alac->input_buffer_index + 2 >= alac->input_buffer_size) {
av_log(NULL, AV_LOG_INFO, "alac: input buffer went out of bounds (%d >= %d)\n", av_log(NULL, AV_LOG_INFO, "alac: input buffer went out of bounds (%d >= %d)\n",
alac->input_buffer_index + 2, alac->input_buffer_size); alac->input_buffer_index + 2, alac->input_buffer_size);
exit (0); // exit (0);
} }
result = (alac->input_buffer[alac->input_buffer_index + 0] << 16) | result = (alac->input_buffer[alac->input_buffer_index + 0] << 16) |
(alac->input_buffer[alac->input_buffer_index + 1] << 8) | (alac->input_buffer[alac->input_buffer_index + 1] << 8) |
@ -186,7 +186,7 @@ static int readbit(alac_file *alac)
if (alac->input_buffer_index >= alac->input_buffer_size) { if (alac->input_buffer_index >= alac->input_buffer_size) {
av_log(NULL, AV_LOG_INFO, "alac: input buffer went out of bounds (%d >= %d)\n", av_log(NULL, AV_LOG_INFO, "alac: input buffer went out of bounds (%d >= %d)\n",
alac->input_buffer_index + 2, alac->input_buffer_size); alac->input_buffer_index + 2, alac->input_buffer_size);
exit (0); // exit (0);
} }
result = alac->input_buffer[alac->input_buffer_index]; result = alac->input_buffer[alac->input_buffer_index];
@ -488,8 +488,8 @@ void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b,
int16_t *buffer_out, int16_t *buffer_out,
int numchannels, int numsamples, int numchannels, int numsamples,
uint8_t interlacing_shift, uint8_t interlacing_shift,
uint8_t interlacing_leftweight) { uint8_t interlacing_leftweight)
{
int i; int i;
if (numsamples <= 0) return; if (numsamples <= 0) return;
@ -546,10 +546,10 @@ void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b,
int decode_frame(ALACContext *s, alac_file *alac, int decode_frame(ALACContext *s, alac_file *alac,
unsigned char *inbuffer, unsigned char *inbuffer,
int input_buffer_size, int input_buffer_size,
void *outbuffer, int *outputsize){ void *outbuffer, int *outputsize)
{
int channels; int channels;
int32_t outputsamples = alac->setinfo_max_samples_per_frame; int32_t outputsamples;
/* initialize from the extradata */ /* initialize from the extradata */
if (!s->context_initialized) { if (!s->context_initialized) {
@ -562,6 +562,7 @@ int decode_frame(ALACContext *s, alac_file *alac,
s->context_initialized = 1; s->context_initialized = 1;
} }
outputsamples = alac->setinfo_max_samples_per_frame;
/* setup the stream */ /* setup the stream */
alac->input_buffer = inbuffer; alac->input_buffer = inbuffer;