From c82bf15dca00f67a701d126e47ea9075fc9459cb Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 23 Feb 2015 23:06:01 +0200 Subject: rtpenc: Merge the h264 and hevc packetizers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They share a great deal of common structure; only a few minor bits in the headers differ. This also fixes an off-by-one in sending of the last fragment of large HEVC nals (where it previously sent len+2 bytes, even if it should have been len+RTP_HEVC_HEADERS_SIZE aka len+3). Signed-off-by: Martin Storsjö --- libavformat/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavformat/Makefile') diff --git a/libavformat/Makefile b/libavformat/Makefile index 387926f0d2..a89d723341 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -299,11 +299,10 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_h261.o \ rtpenc_h263.o \ rtpenc_h263_rfc2190.o \ - rtpenc_hevc.o \ + rtpenc_h264_hevc.o \ rtpenc_jpeg.o \ rtpenc_mpv.o \ rtpenc.o \ - rtpenc_h264.o \ rtpenc_vp8.o \ rtpenc_xiph.o \ avc.o hevc.o -- cgit v1.2.3