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.c | |
| 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.c')
| -rw-r--r-- | libavformat/rtpenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index c4c4d3e416..969e09b00c 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -580,7 +580,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); @@ -603,7 +603,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: |