diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:12:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:14:09 +0100 |
| commit | d469fa1923958f98df9d9b0a9cc167248d8516fb (patch) | |
| tree | 5e398fe8703552c62ae9cc550da156fbc9185fab /libavcodec/version.h | |
| parent | cfc1efc77c7a996b3da7c125c43f7c759cb6d144 (diff) | |
| parent | adfa53d67c7a3318157ea9d95e8bdcfb77139452 (diff) | |
Merge commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452'
* commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452':
lavc: remove disabled FF_API_VDA_ASYNC cruft
Conflicts:
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index ffa2aa23cc..ded4335fe9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -73,9 +73,6 @@ #ifndef FF_API_CODEC_ID #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_VDA_ASYNC -#define FF_API_VDA_ASYNC (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 55) #endif |