diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 03:41:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 03:41:35 +0200 |
| commit | 4216a5082bee6f5132702f5542d986ad4dcc1797 (patch) | |
| tree | 09f6d7047367867438f83c54bab7829f8b1846de /libavcodec/version.h | |
| parent | 939d22a297bf8a7e422eb7ebfda96ec12c5427d3 (diff) | |
| parent | e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b (diff) | |
| download | ffmpeg-4216a5082bee6f5132702f5542d986ad4dcc1797.tar.gz | |
Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'
* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b':
libfdk-aacdec: Reduce the default decoder delay by one frame
Conflicts:
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 f2c4e4856b..25530ed465 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 68 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |