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/rtpenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/rtpenc.c') diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index bf82da0969..0c1f57a50d 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -577,7 +577,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) rtp_send_mpegts_raw(s1, pkt->data, size); break; case AV_CODEC_ID_H264: - ff_rtp_send_h264(s1, pkt->data, size); + ff_rtp_send_h264_hevc(s1, pkt->data, size); break; case AV_CODEC_ID_H261: ff_rtp_send_h261(s1, pkt->data, size); @@ -596,7 +596,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) ff_rtp_send_h263(s1, pkt->data, size); break; case AV_CODEC_ID_HEVC: - ff_rtp_send_hevc(s1, pkt->data, size); + ff_rtp_send_h264_hevc(s1, pkt->data, size); break; case AV_CODEC_ID_VORBIS: case AV_CODEC_ID_THEORA: -- cgit v1.2.3