virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

fftools/ffmpeg_mux: inline mux_free() into of_close()

Browse Source 
mux_free() is no longer called from anywhere else.
This commit is contained in:
Anton Khirnov 2022-10-13 15:26:52 +02:00
parent 36ce335d46
commit d6195c88e2
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fftools/ffmpeg_mux.c
View File

@ -599,8 +599,20 @@ static void fc_close(AVFormatContext **pfc)
*pfc = NULL; *pfc = NULL;
} }
static void mux_free(Muxer *mux) void of_close(OutputFile **pof)
{ {
OutputFile *of = *pof;
Muxer *mux;
if (!of)
return;
mux = mux_from_of(of);
thread_stop(mux);
sq_free(&of->sq_encode);
sq_free(&of->sq_mux);
for (int i = 0; i < mux->of.nb_streams; i++) { for (int i = 0; i < mux->of.nb_streams; i++) {
MuxStream *ms = &mux->streams[i]; MuxStream *ms = &mux->streams[i];
AVPacket *pkt; AVPacket *pkt;
@ -618,23 +630,6 @@ static void mux_free(Muxer *mux)
av_packet_free(&mux->sq_pkt); av_packet_free(&mux->sq_pkt);
fc_close(&mux->fc); fc_close(&mux->fc);
}
void of_close(OutputFile **pof)
{
OutputFile *of = *pof;
Muxer *mux;
if (!of)
return;
mux = mux_from_of(of);
thread_stop(mux);
sq_free(&of->sq_encode);
sq_free(&of->sq_mux);
mux_free(mux_from_of(of));
av_freep(pof); av_freep(pof);
} }