diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-19 23:40:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-20 00:03:19 +0100 |
| commit | 479fb7b8afcf0711b93b48c7d634e9f464d8b336 (patch) | |
| tree | 53f46f6c9f02c4e8b8d9ad1a86f27078e520dc2f /libavformat/rtpenc.c | |
| parent | 87c1783c77f4e688edceec165eaef287bd127622 (diff) | |
| parent | 18ba94c6f9e08fc71cb5c4944bc6e4e1196e4634 (diff) | |
| download | ffmpeg-479fb7b8afcf0711b93b48c7d634e9f464d8b336.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
fix space type in Changelog
ZeroCodec Decoder
RealAudio Lossless decoder
rtpenc: Use AVFormatContext.packet_size instead of a private option
url: Document the expected behaviour of url_read
libavformat: Use AVFormatContext.probesize in init_input
docs: Fix a stray reference to tags in the generic doxy on dicts
cosmetics: Align some AVInput/OutputFormat declarations
zmbv: check decompress result
zmbv: correct indentation
adpcm: convert adpcm_thp to bytestream2.
adpcm: convert adpcm_yamaha to bytestream2.
adpcm: convert adpcm_swf to bytestream2.
adpcm: convert adpcm_sbpro to bytestream2.
adpcm: convert adpcm_ct to bytestream2.
adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
adpcm: convert adpcm_ea_xas to bytestream2.
adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
adpcm: convert ea_maxis_xa to bytestream2.
adpcm: convert adpcm_ea to bytestream2.
...
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/adpcm.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/zerocodec.c
libavcodec/zmbv.c
libavformat/riff.c
libavformat/url.h
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 6c1029b19c..49da08b4e1 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -33,7 +33,6 @@ static const AVOption options[] = { FF_RTP_FLAG_OPTS(RTPMuxContext, flags) { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.dbl = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM }, - { "max_packet_size", "Max packet size", offsetof(RTPMuxContext, max_packet_size), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { NULL }, }; @@ -110,21 +109,21 @@ static int rtp_write_header(AVFormatContext *s1) s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 + NTP_OFFSET_US; - if (s->max_packet_size) { + if (s1->packet_size) { if (s1->pb->max_packet_size) - s->max_packet_size = FFMIN(s->max_packet_size, - s1->pb->max_packet_size); + s1->packet_size = FFMIN(s1->packet_size, + s1->pb->max_packet_size); } else - 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); + s1->packet_size = s1->pb->max_packet_size; + if (s1->packet_size <= 12) { + av_log(s1, AV_LOG_ERROR, "Max packet size %d too low\n", s1->packet_size); return AVERROR(EIO); } - s->buf = av_malloc(s->max_packet_size); + s->buf = av_malloc(s1->packet_size); if (s->buf == NULL) { return AVERROR(ENOMEM); } - s->max_payload_size = s->max_packet_size - 12; + s->max_payload_size = s1->packet_size - 12; s->max_frames_per_packet = 0; if (s1->max_delay) { |