diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 14:55:26 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 14:55:26 +0400 |
| commit | 32ea39f56d90585c63eedfcb631e0a939fc1f95e (patch) | |
| tree | fc23e9cf250c9b2b9b05f617d1513d5386b4de78 /libavcodec/version.h | |
| parent | 257f11820bdf628648466ce07ee0bf67217b543e (diff) | |
| parent | 1914e6f010b3320025c7b692aaea51d9b9a992a8 (diff) | |
Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8':
aacdec: Add support for LD (Low Delay) AAC
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 55065c3ca7..48ca4bb54c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 32 +#define LIBAVCODEC_VERSION_MINOR 33 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |