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/avcodec.h | |
| parent | d9d97f9b3374ee740a6f7218aecb0f5d6cec8f57 (diff) | |
| parent | ad0c9f2d5d81e22207c6ccecc426bf7306acc327 (diff) | |
| download | ffmpeg-fee484edaff77fc831d4cbbdd259ea0948103f86.tar.gz | |
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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2d338f0a45..04b4e1fe67 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1410,12 +1410,12 @@ typedef struct AVFrame { */ int64_t reordered_opaque; +#if FF_API_AVFRAME_LAVC /** - * hardware accelerator private data (FFmpeg-allocated) - * - encoding: unused - * - decoding: Set by libavcodec + * @deprecated this field is unused */ - void *hwaccel_picture_private; + attribute_deprecated void *hwaccel_picture_private; +#endif /** * the AVCodecContext which ff_thread_get_buffer() was last called on |