diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:41:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:42:10 +0100 |
| commit | 3a0c90263605f5cd7992e40d5b91a418621f623f (patch) | |
| tree | 8ede51050dedecf54edc7ad0d311346a247abba2 | |
| parent | b594aceb9482955fc5fadad51e25219cb29d4a1b (diff) | |
| parent | ea29f965dc71182f77b8efe819630f55e48b0ab7 (diff) | |
| download | ffmpeg-3a0c90263605f5cd7992e40d5b91a418621f623f.tar.gz | |
Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'
* commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7':
mov: Support HEVC demuxing
Conflicts:
Changelog
libavformat/mov.c
libavformat/version.h
See: 53f903b7c5427cb18659f7775714e860c1c5fc39
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Changelog | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -49,8 +49,8 @@ version 2.1: - Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support) - Linux framebuffer output device - HEVC decoder -- raw HEVC demuxer -- HEVC demuxing in TS, Matroska and MP4 +- raw HEVC, HEVC in MOV/MP4 demuxing +- HEVC demuxing in TS, Matroska - mergeplanes filter diff --git a/libavformat/version.h b/libavformat/version.h index db12e57acc..ff1b67073d 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 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |