diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:41:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:41:41 +0400 |
| commit | cac07d0e103656a2436ea04b700128ce436a4d06 (patch) | |
| tree | 26ad63f72adfeb90f1f5857cb5c458cdd2d77ff1 /libavcodec/version.h | |
| parent | b7dd250b7545ece973bd4c92fd7f93ce042fa911 (diff) | |
| parent | 5fccedaa67390ccddd6347c8e1c71b7664558bcd (diff) | |
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 44ec052198..290a0c4875 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -147,5 +147,8 @@ #ifndef FF_API_ARCH_SPARC #define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_INPUT_PRESERVED +#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57) +#endif #endif /* AVCODEC_VERSION_H */ |