diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 23:08:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 23:08:08 +0100 |
| commit | f7b041b11b0f1dcfe99918230b56859e6960b9f4 (patch) | |
| tree | e49ba8db5ac08182a38659581bde8789a0f993dd /libavcodec/version.h | |
| parent | d85c9b036e65afa05dcc8fbf37813ef4a05db1f3 (diff) | |
| parent | 7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08 (diff) | |
Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08'
* commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08':
lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/imgconvert.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 48dc26e385..ffa2aa23cc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -70,9 +70,6 @@ #ifndef FF_API_OLD_ENCODE_VIDEO #define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_FIND_BEST_PIX_FMT -#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_CODEC_ID #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #endif |