diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:30:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:30:51 +0100 |
| commit | cf95877474ad8add55126db746f6818b47f71f37 (patch) | |
| tree | 266b74145fbdcc18260b68f87124a0a9bf133c1d /libavformat/rtpenc.h | |
| parent | 17773f49b7da49ceecc4b6260d5ded6938f9b163 (diff) | |
| parent | c82bf15dca00f67a701d126e47ea9075fc9459cb (diff) | |
| download | ffmpeg-cf95877474ad8add55126db746f6818b47f71f37.tar.gz | |
Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'
* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
rtpenc: Merge the h264 and hevc packetizers
Conflicts:
libavformat/rtpenc_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 21e7f26861..d34153fa67 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); |