[SCM] libav/experimental: Rename hwaccel_data_private to hwaccel_picture_private.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 952e2083bc3fd758f871b1141e1358f2c8252735
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date:   Fri Mar 20 12:04:58 2009 +0000

    Rename hwaccel_data_private to hwaccel_picture_private.
    
    Originally committed as revision 18071 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 0519dde..a520340 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -814,7 +814,7 @@ typedef struct AVPanScan{
      * - encoding: unused\
      * - decoding: Set by libavcodec\
      */\
-    void *hwaccel_data_private;\
+    void *hwaccel_picture_private;\
 
 
 #define FF_QSCALE_TYPE_MPEG1 0
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 703992d..a21f06f 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -170,7 +170,7 @@ void ff_copy_picture(Picture *dst, Picture *src){
 static void free_frame_buffer(MpegEncContext *s, Picture *pic)
 {
     s->avctx->release_buffer(s->avctx, (AVFrame*)pic);
-    av_freep(&pic->hwaccel_data_private);
+    av_freep(&pic->hwaccel_picture_private);
 }
 
 /**
@@ -181,10 +181,10 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
     int r;
 
     if (s->avctx->hwaccel) {
-        assert(!pic->hwaccel_data_private);
+        assert(!pic->hwaccel_picture_private);
         if (s->avctx->hwaccel->priv_data_size) {
-            pic->hwaccel_data_private = av_mallocz(s->avctx->hwaccel->priv_data_size);
-            if (!pic->hwaccel_data_private) {
+            pic->hwaccel_picture_private = av_mallocz(s->avctx->hwaccel->priv_data_size);
+            if (!pic->hwaccel_picture_private) {
                 av_log(s->avctx, AV_LOG_ERROR, "alloc_frame_buffer() failed (hwaccel private data allocation)\n");
                 return -1;
             }
@@ -195,7 +195,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
 
     if (r<0 || !pic->age || !pic->type || !pic->data[0]) {
         av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]);
-        av_freep(&pic->hwaccel_data_private);
+        av_freep(&pic->hwaccel_picture_private);
         return -1;
     }
 

-- 
Libav/FFmpeg packaging