diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-11-12 14:26:23 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-11-15 16:24:58 +0100 |
| commit | db932241ee16868475fe9ab4c958fcffd1829ecf (patch) | |
| tree | 459030d14cdf2cfcb39c258227c8667dda3fd0dd /libavformat | |
| parent | 9e8cdb24cd2001959b37b08254d4c0cbc5668717 (diff) | |
| download | ffmpeg-db932241ee16868475fe9ab4c958fcffd1829ecf.tar.gz | |
*/version.h: define FF_API macros unconditionally
There is no reason to wrap them in #ifndef guards, they should only be
defined here and nowhere else. The define guards just add the
possibility to accidentally use the same FF_API name in different
libraries.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/version.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 81ed517609..2e860b8d76 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -55,18 +55,10 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#ifndef FF_API_LAVF_PRIV_OPT #define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_COMPUTE_PKT_FIELDS2 #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_AVIOCONTEXT_WRITTEN #define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 -#endif #endif /* AVFORMAT_VERSION_H */ |