diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:02:43 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:02:43 +0200 |
commit | fdb48225592c593892ffbe799847ff0867253d2a (patch) | |
tree | ba0f9eb21885ef1f70670efe113c6c2f71882e0a /libavcodec/version.h | |
parent | e0f291822306b544366faf408df4661c7acc300e (diff) | |
parent | b3be41ca82529d60f90107d4e0d5b59daab00920 (diff) | |
download | ffmpeg-streaming-fdb48225592c593892ffbe799847ff0867253d2a.zip ffmpeg-streaming-fdb48225592c593892ffbe799847ff0867253d2a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 1bb8377..db43b83 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 37 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MINOR 38 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |