Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:04:44 +0000 (18:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:05:25 +0000 (18:05 +0100)
* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
  mpegts: Support HEVC demuxing

Conflicts:
Changelog
libavformat/version.h

See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/version.h

index dfb17b0..231270f 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -49,8 +49,7 @@ version 2.1:
 - Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support)
 - Linux framebuffer output device
 - HEVC decoder
-- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing
-- HEVC demuxing in TS
+- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing
 - mergeplanes filter
 
 
index 99d6444..0bbc90c 100644 (file)
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
 #define LIBAVFORMAT_VERSION_MINOR 20
-#define LIBAVFORMAT_VERSION_MICRO 103
+#define LIBAVFORMAT_VERSION_MICRO 104
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \