Module: libav Branch: master Commit: f553462041096d5d2afd9a8841a7af50df5c2540
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Thu Feb 23 11:54:13 2012 +0200 rtpenc: Move max_packet_size to a context variable This is in preparation for exposing this via an avoption. Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/rtpenc.c | 12 ++++++------ libavformat/rtpenc.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 66ea4ce..bdbe411 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -82,7 +82,7 @@ static int is_supported(enum CodecID id) static int rtp_write_header(AVFormatContext *s1) { RTPMuxContext *s = s1->priv_data; - int max_packet_size, n; + int n; AVStream *st; if (s1->nb_streams != 1) { @@ -109,16 +109,16 @@ static int rtp_write_header(AVFormatContext *s1) s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 + NTP_OFFSET_US; - max_packet_size = s1->pb->max_packet_size; - if (max_packet_size <= 12) { - av_log(s1, AV_LOG_ERROR, "Max packet size %d too low\n", max_packet_size); + s->max_packet_size = s1->pb->max_packet_size; + if (s->max_packet_size <= 12) { + av_log(s1, AV_LOG_ERROR, "Max packet size %d too low\n", s->max_packet_size); return AVERROR(EIO); } - s->buf = av_malloc(max_packet_size); + s->buf = av_malloc(s->max_packet_size); if (s->buf == NULL) { return AVERROR(ENOMEM); } - s->max_payload_size = max_packet_size - 12; + s->max_payload_size = s->max_packet_size - 12; s->max_frames_per_packet = 0; if (s1->max_delay) { diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 9ccc8e7..2bb2b81 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -34,6 +34,7 @@ struct RTPMuxContext { uint32_t timestamp; uint32_t base_timestamp; uint32_t cur_timestamp; + int max_packet_size; int max_payload_size; int num_frames; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
