diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-22 00:30:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-22 00:30:12 -0300 |
| commit | 417d473bde220a1f267bc694835c129a5adc4309 (patch) | |
| tree | 9ea1a2bb1e39c3eeee3d742aea05d2d0fdbaa0ea /libavcodec/version.h | |
| parent | 90000f15ec41fbb768b6b3d360131638d089bd59 (diff) | |
| download | ffmpeg-417d473bde220a1f267bc694835c129a5adc4309.tar.gz | |
avcodec: remove ABI portion of the side data merging API
The actual API is left in place until the deprecation period ends.
Signed-off-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 fd334e83fd..b09beaa3b9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -130,9 +130,6 @@ #ifndef FF_API_VAAPI_CONTEXT #define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_MERGE_SD -#define FF_API_MERGE_SD (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_AVCTX_TIMEBASE #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) #endif |