virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

Browse Source 
* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
  avconv: simplify exit_program() by using more local vars

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-05 14:39:13 +02:00
parent db01de4c0a 73ed8558a6
commit 6e39707438
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ffmpeg.c
View File

@@ -438,18 +438,20 @@ static void ffmpeg_cleanup(int ret)
} }
for (i = 0; i < nb_filtergraphs; i++) { for (i = 0; i < nb_filtergraphs; i++) {
avfilter_graph_free(&filtergraphs[i]->graph); FilterGraph *fg = filtergraphs[i];
for (j = 0; j < filtergraphs[i]->nb_inputs; j++) { avfilter_graph_free(&fg->graph);
av_freep(&filtergraphs[i]->inputs[j]->name); for (j = 0; j < fg->nb_inputs; j++) {
av_freep(&filtergraphs[i]->inputs[j]); av_freep(&fg->inputs[j]->name);
av_freep(&fg->inputs[j]);
} }
av_freep(&filtergraphs[i]->inputs); av_freep(&fg->inputs);
for (j = 0; j < filtergraphs[i]->nb_outputs; j++) { for (j = 0; j < fg->nb_outputs; j++) {
av_freep(&filtergraphs[i]->outputs[j]->name); av_freep(&fg->outputs[j]->name);
av_freep(&filtergraphs[i]->outputs[j]); av_freep(&fg->outputs[j]);
} }
av_freep(&filtergraphs[i]->outputs); av_freep(&fg->outputs);
av_freep(&filtergraphs[i]->graph_desc); av_freep(&fg->graph_desc);
av_freep(&filtergraphs[i]); av_freep(&filtergraphs[i]);
} }
av_freep(&filtergraphs); av_freep(&filtergraphs);
@@ -458,29 +460,33 @@ static void ffmpeg_cleanup(int ret)
/* close files */ /* close files */
for (i = 0; i < nb_output_files; i++) { for (i = 0; i < nb_output_files; i++) {
AVFormatContext *s = output_files[i]->ctx; OutputFile *of = output_files[i];
AVFormatContext *s = of->ctx;
if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE) && s->pb) if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE) && s->pb)
avio_close(s->pb); avio_close(s->pb);
avformat_free_context(s); avformat_free_context(s);
av_dict_free(&output_files[i]->opts); av_dict_free(&of->opts);
av_freep(&output_files[i]); av_freep(&output_files[i]);
} }
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {
AVBitStreamFilterContext *bsfc = output_streams[i]->bitstream_filters; OutputStream *ost = output_streams[i];
AVBitStreamFilterContext *bsfc = ost->bitstream_filters;
while (bsfc) { while (bsfc) {
AVBitStreamFilterContext *next = bsfc->next; AVBitStreamFilterContext *next = bsfc->next;
av_bitstream_filter_close(bsfc); av_bitstream_filter_close(bsfc);
bsfc = next; bsfc = next;
} }
output_streams[i]->bitstream_filters = NULL; ost->bitstream_filters = NULL;
av_frame_free(&output_streams[i]->filtered_frame); av_frame_free(&ost->filtered_frame);
av_parser_close(output_streams[i]->parser); av_parser_close(ost->parser);
av_freep(&ost->forced_keyframes);
av_expr_free(ost->forced_keyframes_pexpr);
av_freep(&ost->avfilter);
av_freep(&ost->logfile_prefix);
av_freep(&output_streams[i]->forced_keyframes);
av_expr_free(output_streams[i]->forced_keyframes_pexpr);
av_freep(&output_streams[i]->avfilter);
av_freep(&output_streams[i]->logfile_prefix);
av_freep(&output_streams[i]); av_freep(&output_streams[i]);
} }
#if HAVE_PTHREADS #if HAVE_PTHREADS
@@ -491,13 +497,16 @@ static void ffmpeg_cleanup(int ret)
av_freep(&input_files[i]); av_freep(&input_files[i]);
} }
for (i = 0; i < nb_input_streams; i++) { for (i = 0; i < nb_input_streams; i++) {
av_frame_free(&input_streams[i]->decoded_frame); InputStream *ist = input_streams[i];
av_frame_free(&input_streams[i]->filter_frame);
av_dict_free(&input_streams[i]->opts); av_frame_free(&ist->decoded_frame);
avsubtitle_free(&input_streams[i]->prev_sub.subtitle); av_frame_free(&ist->filter_frame);
av_frame_free(&input_streams[i]->sub2video.frame); av_dict_free(&ist->opts);
av_freep(&input_streams[i]->filters); avsubtitle_free(&ist->prev_sub.subtitle);
av_freep(&input_streams[i]->hwaccel_device); av_frame_free(&ist->sub2video.frame);
av_freep(&ist->filters);
av_freep(&ist->hwaccel_device);
av_freep(&input_streams[i]); av_freep(&input_streams[i]);
} }