diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 16:37:30 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:38:04 -0300 |
commit | d2484639bc205112f3841b14424b7744a92fd5e1 (patch) | |
tree | 6a28aeaa53e1b4a25554d9198db978889642bdb9 /libavcodec/version.h | |
parent | 2ccd00dabd5ab4fa2550377be823a521df80c141 (diff) | |
parent | 48bb0da050329e5111b00a12dfc154b7e78fb3a3 (diff) |
Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
* commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3':
lavc: Drop deprecated way of setting audio delay on encode
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 aa2e6a173f..3dd58c448d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -61,9 +61,6 @@ /* XXX: don't forget to drop the -vismv documentation */ #define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_AUDIOENC_DELAY -#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_VAAPI_CONTEXT #define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58) #endif |