[FFmpeg-cvslog] h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

Anton Khirnov git at videolan.org
Thu Dec 12 00:32:50 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Dec  9 11:51:31 2013 +0100| [598ce4ab4f1893e0661fc038101487e511937877] | committer: Anton Khirnov

h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=598ce4ab4f1893e0661fc038101487e511937877
---

 libavcodec/h264.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 29a6960..07a93cf 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1341,8 +1341,8 @@ int ff_h264_alloc_tables(H264Context *h)
         if (!h->DPB)
             return AVERROR(ENOMEM);
         for (i = 0; i < MAX_PICTURE_COUNT; i++)
-            avcodec_get_frame_defaults(&h->DPB[i].f);
-        avcodec_get_frame_defaults(&h->cur_pic.f);
+            av_frame_unref(&h->DPB[i].f);
+        av_frame_unref(&h->cur_pic.f);
     }
 
     return 0;
@@ -1721,7 +1721,7 @@ static int decode_update_thread_context(AVCodecContext *dst,
         h->context_initialized = 0;
 
         memset(&h->cur_pic, 0, sizeof(h->cur_pic));
-        avcodec_get_frame_defaults(&h->cur_pic.f);
+        av_frame_unref(&h->cur_pic.f);
         h->cur_pic.tf.f = &h->cur_pic.f;
 
         h->avctx             = dst;



More information about the ffmpeg-cvslog mailing list