ffmpeg: move packet deallocation into write_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
33a7e288ab
commit
cb640eb335
4
ffmpeg.c
4
ffmpeg.c
@ -666,6 +666,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
|
|||||||
main_return_code = 1;
|
main_return_code = 1;
|
||||||
close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED);
|
close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED);
|
||||||
}
|
}
|
||||||
|
av_free_packet(pkt);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void close_output_stream(OutputStream *ost)
|
static void close_output_stream(OutputStream *ost)
|
||||||
@ -743,8 +744,6 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost,
|
|||||||
}
|
}
|
||||||
|
|
||||||
write_frame(s, &pkt, ost);
|
write_frame(s, &pkt, ost);
|
||||||
|
|
||||||
av_free_packet(&pkt);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1037,7 +1036,6 @@ static void do_video_out(AVFormatContext *s,
|
|||||||
|
|
||||||
frame_size = pkt.size;
|
frame_size = pkt.size;
|
||||||
write_frame(s, &pkt, ost);
|
write_frame(s, &pkt, ost);
|
||||||
av_free_packet(&pkt);
|
|
||||||
|
|
||||||
/* if two pass, output log */
|
/* if two pass, output log */
|
||||||
if (ost->logfile && enc->stats_out) {
|
if (ost->logfile && enc->stats_out) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user