Browse code
Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'
* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
mpegts: Support HEVC demuxing
Conflicts:
Changelog
libavformat/version.h
See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer authored on 2013/11/02 02:04:44Showing 2 changed files
| ... | ... |
@@ -49,8 +49,7 @@ version 2.1: |
| 49 | 49 |
- Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support) |
| 50 | 50 |
- Linux framebuffer output device |
| 51 | 51 |
- HEVC decoder |
| 52 |
-- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing |
|
| 53 |
-- HEVC demuxing in TS |
|
| 52 |
+- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing |
|
| 54 | 53 |
- mergeplanes filter |
| 55 | 54 |
|
| 56 | 55 |
|
| ... | ... |
@@ -31,7 +31,7 @@ |
| 31 | 31 |
|
| 32 | 32 |
#define LIBAVFORMAT_VERSION_MAJOR 55 |
| 33 | 33 |
#define LIBAVFORMAT_VERSION_MINOR 20 |
| 34 |
-#define LIBAVFORMAT_VERSION_MICRO 103 |
|
| 34 |
+#define LIBAVFORMAT_VERSION_MICRO 104 |
|
| 35 | 35 |
|
| 36 | 36 |
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| 37 | 37 |
LIBAVFORMAT_VERSION_MINOR, \ |