diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:25:25 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:26:17 +0200 |
| commit | 037b44a3b44ead1cef8910c52fdd1343779b5203 (patch) | |
| tree | 7ea63198858ef5c7ec085c4341f2f97edb5767f5 /libavcodec/version.h | |
| parent | d59bfcd11229300182c672ca734568919a85f773 (diff) | |
| parent | 00332e0a064dad866812de9162b009cbaba6f5df (diff) | |
| download | ffmpeg-streaming-037b44a3b44ead1cef8910c52fdd1343779b5203.zip ffmpeg-streaming-037b44a3b44ead1cef8910c52fdd1343779b5203.tar.gz | |
Merge commit '00332e0a064dad866812de9162b009cbaba6f5df'
* commit '00332e0a064dad866812de9162b009cbaba6f5df':
wrapped_avframe: Initial implementation
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 c7fc1f1..953ff9f 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 5 +#define LIBAVCODEC_VERSION_MINOR 6 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
