mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-27 21:20:41 +00:00
segfault fix
Originally committed as revision 3322 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
fbf33e4f7c
commit
eb5ec8fe6c
4
ffmpeg.c
4
ffmpeg.c
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user