Commit e92d1e59 authored by gb's avatar gb

Rename hwaccel_data_private to hwaccel_picture_private.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18071 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a886417f
...@@ -814,7 +814,7 @@ typedef struct AVPanScan{ ...@@ -814,7 +814,7 @@ typedef struct AVPanScan{
* - encoding: unused\ * - encoding: unused\
* - decoding: Set by libavcodec\ * - decoding: Set by libavcodec\
*/\ */\
void *hwaccel_data_private;\ void *hwaccel_picture_private;\
#define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG1 0
......
...@@ -170,7 +170,7 @@ void ff_copy_picture(Picture *dst, Picture *src){ ...@@ -170,7 +170,7 @@ void ff_copy_picture(Picture *dst, Picture *src){
static void free_frame_buffer(MpegEncContext *s, Picture *pic) static void free_frame_buffer(MpegEncContext *s, Picture *pic)
{ {
s->avctx->release_buffer(s->avctx, (AVFrame*)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) ...@@ -181,10 +181,10 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
int r; int r;
if (s->avctx->hwaccel) { if (s->avctx->hwaccel) {
assert(!pic->hwaccel_data_private); assert(!pic->hwaccel_picture_private);
if (s->avctx->hwaccel->priv_data_size) { if (s->avctx->hwaccel->priv_data_size) {
pic->hwaccel_data_private = av_mallocz(s->avctx->hwaccel->priv_data_size); pic->hwaccel_picture_private = av_mallocz(s->avctx->hwaccel->priv_data_size);
if (!pic->hwaccel_data_private) { if (!pic->hwaccel_picture_private) {
av_log(s->avctx, AV_LOG_ERROR, "alloc_frame_buffer() failed (hwaccel private data allocation)\n"); av_log(s->avctx, AV_LOG_ERROR, "alloc_frame_buffer() failed (hwaccel private data allocation)\n");
return -1; return -1;
} }
...@@ -195,7 +195,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) ...@@ -195,7 +195,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
if (r<0 || !pic->age || !pic->type || !pic->data[0]) { 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_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; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment