diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:12:07 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:12:07 +0100 |
| commit | 30833d121e24fc644c9c4e6ca07df3e9e4963180 (patch) | |
| tree | db5e1913911cfaa1366f9bcf9efd2371b06f492e /libavcodec/version.h | |
| parent | 10e55bd658b06034d700553190b419b1af92b7cb (diff) | |
| parent | 31c51f7441de07b88cfea2550245bf1f5140cb8f (diff) | |
| download | ffmpeg-30833d121e24fc644c9c4e6ca07df3e9e4963180.tar.gz | |
Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'
* commit '31c51f7441de07b88cfea2550245bf1f5140cb8f':
avpacket: add a function for wrapping existing data as side data
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 3027853263..6f88ee47bc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 17 +#define LIBAVCODEC_VERSION_MINOR 18 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |