diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2009-03-20 12:04:58 +0000 |
|---|---|---|
| committer | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2009-03-20 12:04:58 +0000 |
| commit | 952e2083bc3fd758f871b1141e1358f2c8252735 (patch) | |
| tree | c9dd6309317bdffc196c98770d1685e7686ffe5a | |
| parent | 294eaa26437edf29d866b0bf63d7de57515a0f95 (diff) | |
| download | ffmpeg-952e2083bc3fd758f871b1141e1358f2c8252735.tar.gz | |
Rename hwaccel_data_private to hwaccel_picture_private.
Originally committed as revision 18071 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0519dde1ea..a520340162 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 703992d45e..a21f06f718 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; } |