RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

segfault fix 

Originally committed as revision 3322 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-07-16 00:00:52 +00:00
parent fbf33e4f7c
commit eb5ec8fe6c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -1067,7 +1067,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
uint8_t *data_buf;
int data_size, got_picture;
AVFrame picture;
short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2];
short samples[pkt && pkt->size > AVCODEC_MAX_AUDIO_FRAME_SIZE/2 ? pkt->size : AVCODEC_MAX_AUDIO_FRAME_SIZE/2];
void *buffer_to_free;
if (pkt && pkt->dts != AV_NOPTS_VALUE) { //FIXME seems redundant, as libavformat does this too
@ -1075,7 +1075,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
} else {
assert(ist->pts == ist->next_pts);
}
if (pkt == NULL) {
/* EOF handling */
ptr = NULL;