diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-23 23:06:01 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-24 16:25:43 +0200 |
| commit | c82bf15dca00f67a701d126e47ea9075fc9459cb (patch) | |
| tree | e3764fddb5f6234a4465ff3e9cce69678e106192 /libavformat/rtpenc.h | |
| parent | 3567b91e49c6ae101c9a35c90f46b8ad9890ac15 (diff) | |
| download | ffmpeg-c82bf15dca00f67a701d126e47ea9075fc9459cb.tar.gz | |
rtpenc: Merge the h264 and hevc packetizers
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ö <martin@martin.st>
Diffstat (limited to 'libavformat/rtpenc.h')
| -rw-r--r-- | libavformat/rtpenc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index f4925941bf..c6ac8da43d 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -81,12 +81,11 @@ typedef struct RTPMuxContext RTPMuxContext; void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m); -void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size); +void ff_rtp_send_h264_hevc(AVFormatContext *s1, const uint8_t *buf1, int size); void ff_rtp_send_h261(AVFormatContext *s1, const uint8_t *buf1, int size); void ff_rtp_send_h263(AVFormatContext *s1, const uint8_t *buf1, int size); void ff_rtp_send_h263_rfc2190(AVFormatContext *s1, const uint8_t *buf1, int size, const uint8_t *mb_info, int mb_info_size); -void ff_rtp_send_hevc(AVFormatContext *s1, const uint8_t *buf1, int size); void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size); void ff_rtp_send_latm(AVFormatContext *s1, const uint8_t *buff, int size); void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size); |