diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 18:15:49 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 18:15:49 -0300 |
commit | b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed (patch) | |
tree | 5055beedccbbf7f81f523598117a09755dc6b083 /libavutil/version.h | |
parent | f192f2f061d979e3d2716b9892ca276b5d5cd418 (diff) | |
parent | dd343fd986459f467a2d1d70c26101dff1d47d68 (diff) | |
download | ffmpeg-b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed.tar.gz |
Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'
* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
lavu: Drop deprecated VDPAU pixel formats
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r-- | libavutil/version.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index f5b4f1548d..def7153f31 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -106,9 +106,6 @@ * @{ */ -#ifndef FF_API_VDPAU -#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 56) -#endif #ifndef FF_API_OPT_TYPE_METADATA #define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56) #endif |