Merge commit '9c09fbd8'

* commit '9c09fbd8': rtpdec: experimental VP9 depacketizer (draft 0) Conflicts: libavformat/rtpdec.c libavformat/rtpdec_vp9.c libavformat/version.h See: e4a6486c See: f966ac2b See: 629a03a9Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9c09fbd8'
* commit '9c09fbd8': rtpdec: experimental VP9 depacketizer (draft 0) Conflicts: libavformat/rtpdec.c libavformat/rtpdec_vp9.c libavformat/version.h See: e4a6486c See: f966ac2b See: 629a03a9Merged-by: Michael Niedermayer <michaelni@gmx.at>
63ea3a86 · Michael Niedermayer · dcf7924f · 9c09fbd8 · 63ea3a86 · 63ea3a86
Commit 63ea3a86 authored Mar 05, 2015 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 93 additions and 97 deletions

Changelog Changelog +1 -0

rtpdec_vp9.c libavformat/rtpdec_vp9.c +91 -96

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

No files found.
--- a/Changelog
+++ b/Changelog
@@ -35,6 +35,7 @@ version <next>:
 - Fix stsd atom corruption in DNxHD QuickTimes
 - Canopus HQX decoder
 - RTP depacketization of T.140 text (RFC 4103)
+- VP9 RTP payload format (draft 0) experimental depacketizer


 version 2.5:

--- a/libavformat/rtpdec_vp9.c
+++ b/libavformat/rtpdec_vp9.c
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@

 #define LIBAVFORMAT_VERSION_MAJOR 56
 #define LIBAVFORMAT_VERSION_MINOR  25
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                               LIBAVFORMAT_VERSION_MINOR, \