Skip to content

Commit

Permalink
Use avcodec_free_frame() to free AVFrames.
Browse files Browse the repository at this point in the history
  • Loading branch information
elenril committed Sep 24, 2012
1 parent 9eb2965 commit 11d1ca4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions avconv.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,19 @@ void exit_program(int ret)
bsfc = next;
}
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]->avfilter);
av_freep(&output_streams[i]->logfile_prefix);
av_freep(&output_streams[i]->filtered_frame);
av_freep(&output_streams[i]);
}
for (i = 0; i < nb_input_files; i++) {
avformat_close_input(&input_files[i]->ctx);
av_freep(&input_files[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);
free_buffer_pool(&input_streams[i]->buffer_pool);
av_freep(&input_streams[i]->filters);
Expand Down
4 changes: 2 additions & 2 deletions avplay.c
Original file line number Diff line number Diff line change
Expand Up @@ -1704,7 +1704,7 @@ static int video_thread(void *arg)
avfilter_graph_free(&graph);
#endif
av_free_packet(&pkt);
av_free(frame);
avcodec_free_frame(&frame);
return 0;
}

Expand Down Expand Up @@ -2191,7 +2191,7 @@ static void stream_component_close(VideoState *is, int stream_index)
avresample_free(&is->avr);
av_freep(&is->audio_buf1);
is->audio_buf = NULL;
av_freep(&is->frame);
avcodec_free_frame(&is->frame);

if (is->rdft) {
av_rdft_end(is->rdft);
Expand Down
8 changes: 4 additions & 4 deletions libavcodec/api-example.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static void audio_encode_example(const char *filename)
fclose(f);

av_freep(&samples);
av_freep(&frame);
avcodec_free_frame(&frame);
avcodec_close(c);
av_free(c);
}
Expand Down Expand Up @@ -308,7 +308,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)

avcodec_close(c);
av_free(c);
av_free(decoded_frame);
avcodec_free_frame(&decoded_frame);
}

/*
Expand Down Expand Up @@ -432,7 +432,7 @@ static void video_encode_example(const char *filename)
avcodec_close(c);
av_free(c);
av_freep(&picture->data[0]);
av_free(picture);
avcodec_free_frame(&picture);
printf("\n");
}

Expand Down Expand Up @@ -568,7 +568,7 @@ static void video_decode_example(const char *outfilename, const char *filename)

avcodec_close(c);
av_free(c);
av_free(picture);
avcodec_free_frame(&picture);
printf("\n");
}

Expand Down
2 changes: 1 addition & 1 deletion libavfilter/vsrc_movie.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static av_cold void uninit(AVFilterContext *ctx)
if (movie->format_ctx)
avformat_close_input(&movie->format_ctx);
avfilter_unref_buffer(movie->picref);
av_freep(&movie->frame);
avcodec_free_frame(&movie->frame);
}

static int query_formats(AVFilterContext *ctx)
Expand Down
1 change: 1 addition & 0 deletions libavformat/output-example.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
fprintf(stderr, "Error while writing audio frame\n");
exit(1);
}
avcodec_free_frame(&frame);
}

static void close_audio(AVFormatContext *oc, AVStream *st)
Expand Down

0 comments on commit 11d1ca4

Please sign in to comment.