mpegvideo: fix allocation of the hwaccel_picture_private data
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 15 Mar 2013 20:20:37 +0000 (21:20 +0100)
committerAnton Khirnov <anton@khirnov.net>
Tue, 19 Mar 2013 10:18:42 +0000 (11:18 +0100)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/mpegvideo.c

index 9048179..ae6cdef 100644 (file)
@@ -269,11 +269,12 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
     if (s->avctx->hwaccel) {
         assert(!pic->hwaccel_picture_private);
         if (s->avctx->hwaccel->priv_data_size) {
-            pic->hwaccel_picture_private = av_mallocz(s->avctx->hwaccel->priv_data_size);
-            if (!pic->hwaccel_picture_private) {
+            pic->hwaccel_priv_buf = av_buffer_allocz(s->avctx->hwaccel->priv_data_size);
+            if (!pic->hwaccel_priv_buf) {
                 av_log(s->avctx, AV_LOG_ERROR, "alloc_frame_buffer() failed (hwaccel private data allocation)\n");
                 return -1;
             }
+            pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data;
         }
     }
 
@@ -293,7 +294,8 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
     if (r < 0 || !pic->f.data[0]) {
         av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %p)\n",
                r, pic->f.data[0]);
-        av_freep(&pic->hwaccel_picture_private);
+        av_buffer_unref(&pic->hwaccel_priv_buf);
+        pic->hwaccel_picture_private = NULL;
         return -1;
     }