diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:46:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:46:38 +0400 |
| commit | 185164398763b76729d6169bea35d08c48d1d32f (patch) | |
| tree | 27d0d0368c03a9f26718ed2d49bfe5319413288e /libavcodec/version.h | |
| parent | cac07d0e103656a2436ea04b700128ce436a4d06 (diff) | |
| parent | b2c31710c96fa47d9dcd40b64d39663e8957f683 (diff) | |
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
Conflicts:
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 290a0c4875..b29cf08d95 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 60 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -150,5 +150,8 @@ #ifndef FF_API_INPUT_PRESERVED #define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57) #endif +#ifndef FF_API_NORMALIZE_AQP +#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 57) +#endif #endif /* AVCODEC_VERSION_H */ |