Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
  Add raw HEVC demuxer

Conflicts:
	Changelog
	libavformat/hevcdec.c
	libavformat/version.h

See: 902a5fa722 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Changelog

@@ -48,7 +48,9 @@ version 2.1:
 - ReplayGain scanner
 - 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
+- HEVC decoder
+- raw HEVC demuxer
+- HEVC demuxing in TS, Matroska and MP4
 - mergeplanes filter
 
 

doc/general.texi

@@ -340,6 +340,7 @@ library:
 @item raw H.261                 @tab X @tab X
 @item raw H.263                 @tab X @tab X
 @item raw H.264                 @tab X @tab X
+@item raw HEVC                  @tab   @tab X
 @item raw Ingenient MJPEG       @tab   @tab X
 @item raw MJPEG                 @tab X @tab X
 @item raw MLP                   @tab   @tab X

libavformat/hevcdec.c

@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/hevc.h"
+
 #include "avformat.h"
 #include "rawdec.h"
 
-#include "libavcodec/hevc.h"
-
 static int hevc_probe(AVProbeData *p)
 {
     uint32_t code = -1;
@@ -56,8 +56,6 @@ static int hevc_probe(AVProbeData *p)
         }
     }
 
-    // printf("vps=%d, sps=%d, pps=%d, irap=%d\n", vps, sps, pps, irap);
-
     if (vps && sps && pps && irap)
         return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg
     return 0;

libavformat/version.h

@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
 #define LIBAVFORMAT_VERSION_MINOR 20
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \