diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:49:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:49:13 +0200 |
| commit | fa0f7c024e90a5337892cbc3b78e936ba5d25cf3 (patch) | |
| tree | 8e83e3ad53663a6bb0bbf6b381d6f1a9b82521ec /libavcodec/h264_slice.c | |
| parent | 8d19dd91a51c296c92a9d94ab9541a3cb7316bab (diff) | |
| parent | a871ef0cc936612bdb0e643196be72efcf0c8986 (diff) | |
| download | ffmpeg-fa0f7c024e90a5337892cbc3b78e936ba5d25cf3.tar.gz | |
Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'
* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
hwaccel: Rename priv_data_size to frame_priv_data_size
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 7d28ba2a73..7969d2c5cd 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -265,8 +265,8 @@ static int alloc_picture(H264Context *h, H264Picture *pic) if (h->avctx->hwaccel) { const AVHWAccel *hwaccel = h->avctx->hwaccel; av_assert0(!pic->hwaccel_picture_private); - if (hwaccel->priv_data_size) { - pic->hwaccel_priv_buf = av_buffer_allocz(hwaccel->priv_data_size); + if (hwaccel->frame_priv_data_size) { + pic->hwaccel_priv_buf = av_buffer_allocz(hwaccel->frame_priv_data_size); if (!pic->hwaccel_priv_buf) return AVERROR(ENOMEM); pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data; |