diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 16:04:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:04:31 -0300 |
| commit | 7b550c5f84f21ce883e86bc91f16093641d5dc85 (patch) | |
| tree | 5cffe208a3e3c1577e0be2efe49310745d889100 /libavcodec/version.h | |
| parent | d658e04337c590043190718ec4a8137d3e8216b9 (diff) | |
| parent | b3739599bda740ac12d3dde31a331b744df99123 (diff) | |
| download | ffmpeg-7b550c5f84f21ce883e86bc91f16093641d5dc85.tar.gz | |
Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
* commit 'b3739599bda740ac12d3dde31a331b744df99123':
lavc: Drop deprecated emu edge functionality
Merged-by: James Almer <jamrial@gmail.com>
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 4565cd5aac..df427fbff4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -57,9 +57,6 @@ #ifndef FF_API_DEBUG_MV #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_EMU_EDGE -#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_UNUSED_MEMBERS #define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58) #endif |