On Tue, Feb 02, 2016 at 12:21:53AM +0100, Thomas Volkert wrote: > This implements the receiver side for > https://tools.ietf.org/html/draft-weaver-payload-rtp-vc2hq-01 > > --- > Changelog | 1 + > libavformat/Makefile | 1 + > libavformat/rtpdec.c | 1 + > libavformat/rtpdec_formats.h | 1 + > libavformat/rtpdec_vc2hq.c | 227 > +++++++++++++++++++++++++++++++++++++++++++ > libavformat/version.h | 4 +- > 6 files changed, 233 insertions(+), 2 deletions(-) > create mode 100644 libavformat/rtpdec_vc2hq.c > > diff --git a/Changelog b/Changelog > index 2f2ca3e..0b484d8 100644 > --- a/Changelog > +++ b/Changelog > @@ -64,6 +64,7 @@ version <next>: > - new DCA decoder with full support for DTS-HD extensions > - significant performance improvements in Windows Television (WTV) demuxer > - nnedi deinterlacer > +- VC-2 HQ RTP payload format (draft v1) depacketizer > > > version 2.8: > diff --git a/libavformat/Makefile b/libavformat/Makefile > index 35a383d..db86742 100644 > --- a/libavformat/Makefile > +++ b/libavformat/Makefile > @@ -51,6 +51,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o > \ > rtpdec_qdm2.o \ > rtpdec_qt.o \ > rtpdec_svq3.o \ > + rtpdec_vc2hq.o \
doesnt apply Applying: rtpdec: support for VC-2 HQ RTP payload format (draft v1) fatal: corrupt patch at line 29 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 rtpdec: support for VC-2 HQ RTP payload format (draft v1) When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Avoid a single point of failure, be that a person or equipment.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
