diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 12:59:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 13:05:05 +0200 |
| commit | b654aa6beb41366f8771525b4f2d864e992d48c1 (patch) | |
| tree | 4ced9ec120908e390d885b9b0ec2e947ef240fd9 /libavcodec/version.h | |
| parent | e82071e7279ab8d8ec138753822222a6cff26f35 (diff) | |
| parent | 7e52080cb18332cb1da9fe133498750b6b4b0fb3 (diff) | |
| download | ffmpeg-b654aa6beb41366f8771525b4f2d864e992d48c1.tar.gz | |
Merge commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3'
* commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3':
pcm: support 24-bit/32-bit little-endian planar
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c
See: 467dfd5dfae7cc435a2b2e7cf012a0de2fea5848
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 48ca4bb54c..1d23ef34e8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 33 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |