diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:48:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:48:23 +0100 |
| commit | c09eeca5468ca03cc5733f08dc6303b4aef2c2c1 (patch) | |
| tree | 4cb9bc74bdd24febb33f737eb4d8206f0c6f803a /libavcodec/version.h | |
| parent | cb03d29dec649efb03b895810f610e61d70800ca (diff) | |
| parent | 8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4 (diff) | |
| download | ffmpeg-streaming-c09eeca5468ca03cc5733f08dc6303b4aef2c2c1.zip ffmpeg-streaming-c09eeca5468ca03cc5733f08dc6303b4aef2c2c1.tar.gz | |
Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'
* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4':
libavcodec: Add an OpenH264 encoder wrapper
Conflicts:
Changelog
configure
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 d8c891d..7e51f3b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 19 +#define LIBAVCODEC_VERSION_MINOR 20 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
