Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'
* commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
4
ffplay.c
4
ffplay.c
@@ -1795,7 +1795,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;
|
||||
}
|
||||
|
||||
@@ -2296,7 +2296,7 @@ static void stream_component_close(VideoState *is, int stream_index)
|
||||
swr_free(&is->swr_ctx);
|
||||
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);
|
||||
|
Reference in New Issue
Block a user