diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:38:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:38:55 +0100 |
| commit | db594f65ec4e4a8d85113f309f3d9c31959b48e3 (patch) | |
| tree | c097024735bb75c6a3920b2dc9d4ca1a8f965302 /libavcodec/version.h | |
| parent | 5beddbc4cf81fc29866981cdf62de76299627ed0 (diff) | |
| parent | 845017105f240ac5348aad1f8a5256b86d49db76 (diff) | |
| download | ffmpeg-db594f65ec4e4a8d85113f309f3d9c31959b48e3.tar.gz | |
Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'
* commit '845017105f240ac5348aad1f8a5256b86d49db76':
lavc: remove disabled FF_API_DSP_MASK cruft
lavc: remove disabled FF_API_SUB_ID cruft
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 6ab9126e1e..48dc26e385 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -70,12 +70,6 @@ #ifndef FF_API_OLD_ENCODE_VIDEO #define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_SUB_ID -#define FF_API_SUB_ID (LIBAVCODEC_VERSION_MAJOR < 55) -#endif -#ifndef FF_API_DSP_MASK -#define FF_API_DSP_MASK (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_FIND_BEST_PIX_FMT #define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55) #endif |