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 /libavutil | |
| 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 'libavutil')
| -rw-r--r-- | libavutil/version.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index ee33390157..d95a8a2901 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -132,7 +132,9 @@ #ifndef FF_API_LLS_PRIVATE #define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 53) #endif - +#ifndef FF_API_AVFRAME_LAVC +#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 53) +#endif /** * @} |