diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-17 11:31:40 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-17 11:31:40 +0200 |
| commit | 7c46f24bde12d13e3214852b87f8bb2a8bbf0ac8 (patch) | |
| tree | cdf4e57e02057612d74f2285715f084b2e453e8f /libavcodec/version.h | |
| parent | 695ff5dc6d9ed88a61a544146a6358ecc5259e6c (diff) | |
| parent | e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86 (diff) | |
| download | ffmpeg-7c46f24bde12d13e3214852b87f8bb2a8bbf0ac8.tar.gz | |
Merge commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86'
* commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86':
d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext
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 07a9070d01..3521660cfc 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 2 +#define LIBAVCODEC_VERSION_MINOR 3 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |