Merge commit '95e177ee'

* commit '95e177ee': rtpdec: HEVC/H.265 support Conflicts: Changelog libavformat/rtpdec_hevc.c libavformat/version.h See: 96b2ba68Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '95e177ee'
* commit '95e177ee': rtpdec: HEVC/H.265 support Conflicts: Changelog libavformat/rtpdec_hevc.c libavformat/version.h See: 96b2ba68Merged-by: Michael Niedermayer <michaelni@gmx.at>
4bc4f6f1 · Michael Niedermayer · dc81c0a0 · 95e177ee · 4bc4f6f1 · 4bc4f6f1
Commit 4bc4f6f1 authored Sep 03, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 67 additions and 102 deletions

Changelog Changelog +1 -1

rtpdec_hevc.c libavformat/rtpdec_hevc.c +65 -100

version.h libavformat/version.h +1 -1

No files found.
--- a/Changelog
+++ b/Changelog
@@ -9,7 +9,7 @@ version <next>:
 - support for using metadata in stream specifiers in fftools
 - LZMA compression support in TIFF decoder
 - support for H.261 RTP payload format (RFC 4587)
- support for HEVC/H.265 RTP payload format (draft v6) - depacketizing
+- HEVC/H.265 RTP payload format (draft v6) depacketizer
 - added codecview filter to visualize information exported by some codecs
 - matroska 3d support thorugh side data


--- a/libavformat/rtpdec_hevc.c
+++ b/libavformat/rtpdec_hevc.c
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/version.h"

 #define LIBAVFORMAT_VERSION_MAJOR 56
-#define LIBAVFORMAT_VERSION_MINOR  3
+#define LIBAVFORMAT_VERSION_MINOR  4
 #define LIBAVFORMAT_VERSION_MICRO 100

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \