mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-19 07:05:53 +08:00
segfault fix
Originally committed as revision 3322 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
4
ffmpeg.c
4
ffmpeg.c
@@ -1067,7 +1067,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
|
|||||||
uint8_t *data_buf;
|
uint8_t *data_buf;
|
||||||
int data_size, got_picture;
|
int data_size, got_picture;
|
||||||
AVFrame 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;
|
void *buffer_to_free;
|
||||||
|
|
||||||
if (pkt && pkt->dts != AV_NOPTS_VALUE) { //FIXME seems redundant, as libavformat does this too
|
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 {
|
} else {
|
||||||
assert(ist->pts == ist->next_pts);
|
assert(ist->pts == ist->next_pts);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pkt == NULL) {
|
if (pkt == NULL) {
|
||||||
/* EOF handling */
|
/* EOF handling */
|
||||||
ptr = NULL;
|
ptr = NULL;
|
||||||
|
Reference in New Issue
Block a user