diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 20:35:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 20:35:43 +0200 |
| commit | 5a1aa559054b197b64453c60dd01bc5c37532ff9 (patch) | |
| tree | 0637dbfbde146258ebacdfa0b2c7aadbe24ec856 /libavcodec/version.h | |
| parent | 242f8bb3a8a11a54266f43ad45a5a4a260dcbe7f (diff) | |
| parent | b01a2204b5cff7bb920f42fda1bb0103f450fe93 (diff) | |
| download | ffmpeg-streaming-5a1aa559054b197b64453c60dd01bc5c37532ff9.zip ffmpeg-streaming-5a1aa559054b197b64453c60dd01bc5c37532ff9.tar.gz | |
Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'
* commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93':
libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support
Conflicts:
libavcodec/libfdk-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 1efe55c..3e193e5 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MINOR 8 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |
