From bf8fc26e4058e5d9d83703d6b044d1b3cb1dc672 Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Wed, 2 Mar 2016 15:45:57 +0100 Subject: [PATCH] Removed deprecated use of avcodec_alloc_frame() --- accelerator/cpu/image/image_mixer.cpp | 3 +-- modules/ffmpeg/producer/util/util.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/accelerator/cpu/image/image_mixer.cpp b/accelerator/cpu/image/image_mixer.cpp index ac2ebbbd9..07d669deb 100644 --- a/accelerator/cpu/image/image_mixer.cpp +++ b/accelerator/cpu/image/image_mixer.cpp @@ -280,8 +280,7 @@ private: temp_buffers_.push(dest_frame); { - spl::shared_ptr dest_av_frame(avcodec_alloc_frame(), av_free); - avcodec_get_frame_defaults(dest_av_frame.get()); + auto dest_av_frame = ffmpeg::create_frame(); avpicture_fill(reinterpret_cast(dest_av_frame.get()), dest_frame->data(), PIX_FMT_BGRA, width, height); sws_scale(sws_device.get(), input_av_frame->data, input_av_frame->linesize, 0, input_av_frame->height, dest_av_frame->data, dest_av_frame->linesize); diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp index e848c56ee..ce1994b88 100644 --- a/modules/ffmpeg/producer/util/util.cpp +++ b/modules/ffmpeg/producer/util/util.cpp @@ -205,8 +205,7 @@ core::mutable_frame make_frame(const void* tag, const spl::shared_ptr& boost::errinfo_api_function("sws_getContext")); } - spl::shared_ptr av_frame(avcodec_alloc_frame(), av_free); - avcodec_get_frame_defaults(av_frame.get()); + auto av_frame = create_frame(); if(target_pix_fmt == PIX_FMT_BGRA) { auto size = avpicture_fill(reinterpret_cast(av_frame.get()), write.image_data(0).begin(), PIX_FMT_BGRA, width, height); @@ -273,8 +272,7 @@ spl::shared_ptr make_av_frame(core::mutable_frame& frame) spl::shared_ptr make_av_frame(std::array data, const core::pixel_format_desc& pix_desc) { - spl::shared_ptr av_frame(avcodec_alloc_frame(), av_free); - avcodec_get_frame_defaults(av_frame.get()); + auto av_frame = create_frame(); auto planes = pix_desc.planes; auto format = pix_desc.format; @@ -485,7 +483,10 @@ spl::shared_ptr create_packet() spl::shared_ptr create_frame() { - spl::shared_ptr frame(avcodec_alloc_frame(), av_free); + spl::shared_ptr frame(av_frame_alloc(), [](AVFrame* p) + { + av_frame_free(&p); + }); avcodec_get_frame_defaults(frame.get()); return frame; } -- 2.39.2