diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 19:35:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 19:35:37 +0100 |
| commit | fee484edaff77fc831d4cbbdd259ea0948103f86 (patch) | |
| tree | b8b7ba5d51cbb3da036a9e28534575aa8419e4ca /libavcodec/mpegvideo.c | |
| parent | d9d97f9b3374ee740a6f7218aecb0f5d6cec8f57 (diff) | |
| parent | ad0c9f2d5d81e22207c6ccecc426bf7306acc327 (diff) | |
Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
lavc: move AVFrame.hwaccel_picture_private to Picture.
Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 60479d3350..938579824f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -252,7 +252,7 @@ static void free_frame_buffer(MpegEncContext *s, Picture *pic) ff_thread_release_buffer(s->avctx, &pic->f); else avcodec_default_release_buffer(s->avctx, &pic->f); - av_freep(&pic->f.hwaccel_picture_private); + av_freep(&pic->hwaccel_picture_private); } int ff_mpv_frame_size_alloc(MpegEncContext *s, int linesize) @@ -288,10 +288,10 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) int r, ret; if (s->avctx->hwaccel) { - assert(!pic->f.hwaccel_picture_private); + assert(!pic->hwaccel_picture_private); if (s->avctx->hwaccel->priv_data_size) { - pic->f.hwaccel_picture_private = av_mallocz(s->avctx->hwaccel->priv_data_size); - if (!pic->f.hwaccel_picture_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; } @@ -308,7 +308,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) if (r < 0 || !pic->f.type || !pic->f.data[0]) { av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %p)\n", r, pic->f.type, pic->f.data[0]); - av_freep(&pic->f.hwaccel_picture_private); + av_freep(&pic->hwaccel_picture_private); return -1; } |