Commit 63ea3a86 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dcf7924f 9c09fbd8
...@@ -35,6 +35,7 @@ version <next>: ...@@ -35,6 +35,7 @@ version <next>:
- Fix stsd atom corruption in DNxHD QuickTimes - Fix stsd atom corruption in DNxHD QuickTimes
- Canopus HQX decoder - Canopus HQX decoder
- RTP depacketization of T.140 text (RFC 4103) - RTP depacketization of T.140 text (RFC 4103)
- VP9 RTP payload format (draft 0) experimental depacketizer
version 2.5: version 2.5:
......
This diff is collapsed.
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MAJOR 56
#define LIBAVFORMAT_VERSION_MINOR 25 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment