eden-emu/FFmpeg
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use avcodec_free_frame() to free AVFrames.

Browse source
This commit is contained in:
Anton Khirnov 2012-09-21 09:10:23 +02:00
parent 9eb296572e
commit 11d1ca4b2c
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
avconv.c
View file

@ -180,11 +180,11 @@ void exit_program(int ret)
bsfc = next; bsfc = next;
} }
output_streams[i]->bitstream_filters = NULL; output_streams[i]->bitstream_filters = NULL;
avcodec_free_frame(&output_streams[i]->filtered_frame);
av_freep(&output_streams[i]->forced_keyframes); av_freep(&output_streams[i]->forced_keyframes);
av_freep(&output_streams[i]->avfilter); av_freep(&output_streams[i]->avfilter);
av_freep(&output_streams[i]->logfile_prefix); av_freep(&output_streams[i]->logfile_prefix);
av_freep(&output_streams[i]->filtered_frame);
av_freep(&output_streams[i]); av_freep(&output_streams[i]);
} }
for (i = 0; i < nb_input_files; i++) { for (i = 0; i < nb_input_files; i++) {
@ -192,7 +192,7 @@ void exit_program(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_freep(&input_streams[i]->decoded_frame); avcodec_free_frame(&input_streams[i]->decoded_frame);
av_dict_free(&input_streams[i]->opts); av_dict_free(&input_streams[i]->opts);
free_buffer_pool(&input_streams[i]->buffer_pool); free_buffer_pool(&input_streams[i]->buffer_pool);
av_freep(&input_streams[i]->filters); av_freep(&input_streams[i]->filters);

4
avplay.c
View file

@ -1704,7 +1704,7 @@ static int video_thread(void *arg)
avfilter_graph_free(&graph); avfilter_graph_free(&graph);
#endif #endif
av_free_packet(&pkt); av_free_packet(&pkt);
av_free(frame); avcodec_free_frame(&frame);
return 0; return 0;
} }
@ -2191,7 +2191,7 @@ static void stream_component_close(VideoState *is, int stream_index)
avresample_free(&is->avr); avresample_free(&is->avr);
av_freep(&is->audio_buf1); av_freep(&is->audio_buf1);
is->audio_buf = NULL; is->audio_buf = NULL;
av_freep(&is->frame); avcodec_free_frame(&is->frame);
if (is->rdft) { if (is->rdft) {
av_rdft_end(is->rdft); av_rdft_end(is->rdft);

8
libavcodec/api-example.c
View file

@ -212,7 +212,7 @@ static void audio_encode_example(const char *filename)
fclose(f); fclose(f);
av_freep(&samples); av_freep(&samples);
av_freep(&frame); avcodec_free_frame(&frame);
avcodec_close(c); avcodec_close(c);
av_free(c); av_free(c);
} }
@ -308,7 +308,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)
avcodec_close(c); avcodec_close(c);
av_free(c); av_free(c);
av_free(decoded_frame); avcodec_free_frame(&decoded_frame);
} }
/* /*
@ -432,7 +432,7 @@ static void video_encode_example(const char *filename)
avcodec_close(c); avcodec_close(c);
av_free(c); av_free(c);
av_freep(&picture->data[0]); av_freep(&picture->data[0]);
av_free(picture); avcodec_free_frame(&picture);
printf("\n"); printf("\n");
} }
@ -568,7 +568,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
avcodec_close(c); avcodec_close(c);
av_free(c); av_free(c);
av_free(picture); avcodec_free_frame(&picture);
printf("\n"); printf("\n");
} }

2
libavfilter/vsrc_movie.c
View file

@ -197,7 +197,7 @@ static av_cold void uninit(AVFilterContext *ctx)
if (movie->format_ctx) if (movie->format_ctx)
avformat_close_input(&movie->format_ctx); avformat_close_input(&movie->format_ctx);
avfilter_unref_buffer(movie->picref); avfilter_unref_buffer(movie->picref);
av_freep(&movie->frame); avcodec_free_frame(&movie->frame);
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)

1
libavformat/output-example.c
View file

@ -165,6 +165,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
fprintf(stderr, "Error while writing audio frame\n"); fprintf(stderr, "Error while writing audio frame\n");
exit(1); exit(1);
} }
avcodec_free_frame(&frame);
} }
static void close_audio(AVFormatContext *oc, AVStream *st) static void close_audio(AVFormatContext *oc, AVStream *st)