diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 01:17:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 01:17:49 +0200 |
| commit | 4a2bcdb28b510ae1378b82acf422f8c8ff8a4635 (patch) | |
| tree | d4853a92b57fe47e3a618e8833fd7a309dac8e8a /libavcodec/version.h | |
| parent | edfcbf7c83cb7828c0531e788ba8c5c47b07fc5f (diff) | |
| parent | 1761ab838c75223a6b97d8c0720d09275374c53d (diff) | |
Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'
* commit '1761ab838c75223a6b97d8c0720d09275374c53d':
lavc: Deprecate avctx.rc_strategy
Conflicts:
libavcodec/mpegvideo.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index d2bba0aeba..f315c87e44 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MINOR 46 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -193,5 +193,8 @@ #ifndef FF_API_QUANT_BIAS #define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_RC_STRATEGY +#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |