Removed deprecated use of avcodec_alloc_frame()

diff --git a/accelerator/cpu/image/image_mixer.cpp b/accelerator/cpu/image/image_mixer.cpp
index ac2ebbbd9c458b5fab5f702fd683bf64069c8df0..07d669deb382a90f91dc93700f219bc9dacc864c 100644 (file)
--- 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<AVFrame> 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<AVPicture*>(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 e848c56eeec3fe2a5ffd73e965022fa06f8dc053..ce1994b8854f9536729dc7feaf7a3913b3b5594f 100644 (file)
--- 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<AVFrame>&
                                                                        boost::errinfo_api_function("sws_getContext"));
                }       
                
-               spl::shared_ptr<AVFrame> 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<AVPicture*>(av_frame.get()), write.image_data(0).begin(), PIX_FMT_BGRA, width, height);
@@ -273,8 +272,7 @@ spl::shared_ptr<AVFrame> make_av_frame(core::mutable_frame& frame)
 
 spl::shared_ptr<AVFrame> make_av_frame(std::array<uint8_t*, 4> data, const core::pixel_format_desc& pix_desc)
 {
-       spl::shared_ptr<AVFrame> 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<AVPacket> create_packet()
 
 spl::shared_ptr<AVFrame> create_frame()
 {      
-       spl::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), av_free);
+       spl::shared_ptr<AVFrame> frame(av_frame_alloc(), [](AVFrame* p)
+       {
+               av_frame_free(&p);
+       });
        avcodec_get_frame_defaults(frame.get());
        return frame;
 }