diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:57:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:57:57 +0100 |
| commit | 0fbeeb939915b69050d00feab93aa904d133ec5f (patch) | |
| tree | 410d9d0778c11108f4851655611c55753a4c711b /libavformat/version.h | |
| parent | 3a0c90263605f5cd7992e40d5b91a418621f623f (diff) | |
| parent | 959bea13ce3498a5bddf8a415a061a7bb5a8b075 (diff) | |
| download | ffmpeg-0fbeeb939915b69050d00feab93aa904d133ec5f.tar.gz | |
Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
matroskadec: Support HEVC demuxing
Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h
See: 16b6839de6767924c4640d6e9204b6eeb5c53910
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index ff1b67073d..99d64445ba 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 20 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |