aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/version.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-09-27 23:29:20 -0300
committerJames Almer <jamrial@gmail.com>2017-09-27 23:31:53 -0300
commit7aa6b8a68fce93d84c359158f198cd55324d0025 (patch)
tree667ebb2f9bccc2b2703c5a10df990a017e917a5d /libavutil/version.h
parent24ee1b8c6343f00a3f5cd5d5aee5850f22436204 (diff)
parent4de220d2e3751c459f8739a08ac6ca52e63eba30 (diff)
downloadffmpeg-7aa6b8a68fce93d84c359158f198cd55324d0025.tar.gz
Merge commit '4de220d2e3751c459f8739a08ac6ca52e63eba30'
* commit '4de220d2e3751c459f8739a08ac6ca52e63eba30': frame: allow align=0 (meaning automatic) for av_frame_get_buffer() See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r--libavutil/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h
index 9dbcdc4a8c..dee4f5b4c5 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -81,7 +81,7 @@
#define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 77
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \