mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
avoid overwriting pkt
Originally committed as revision 6723 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
595da759de
commit
5b9d79bd77
@ -792,7 +792,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
|
|||||||
pkt = NULL;
|
pkt = NULL;
|
||||||
}
|
}
|
||||||
if (flush || av_fifo_size(&sc->audio_buffer) >= GXF_AUDIO_PACKET_SIZE) {
|
if (flush || av_fifo_size(&sc->audio_buffer) >= GXF_AUDIO_PACKET_SIZE) {
|
||||||
if (gxf_new_audio_packet(gxf, sc, &new_pkt, flush) > 0) {
|
if (!pkt && gxf_new_audio_packet(gxf, sc, &new_pkt, flush) > 0) {
|
||||||
pkt = &new_pkt;
|
pkt = &new_pkt;
|
||||||
break; /* add pkt right now into list */
|
break; /* add pkt right now into list */
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user