diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-08 13:11:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-08 14:22:43 -0300 |
| commit | f089e02fa2b7716d9fa5228c734e55678437db85 (patch) | |
| tree | ff8ec50c447f2e23dadf83535093655d96ebe5e0 /libavcodec/version.h | |
| parent | a47bd5d77e3f1dd8bb3d4ba0955bd7b1323c7d83 (diff) | |
| parent | 019ab88a95cb31b698506d90e8ce56695a7f1cc5 (diff) | |
| download | ffmpeg-f089e02fa2b7716d9fa5228c734e55678437db85.tar.gz | |
Merge commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5'
* commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5':
lavc: add an option for exporting cropping information to the caller
Merged-by: James Almer <jamrial@gmail.com>
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 969f985895..4b2d85f00d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 94 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 95 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |