diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:24:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:24:27 +0100 |
| commit | 769b473a418638c74020998388b0be74f2ff1858 (patch) | |
| tree | 4a0248071bc66ed9a35fee037960108bfed0de2a /libavformat/rtpenc.c | |
| parent | a2c4c30b5f6111f977c5a7284ed625b3eb8db132 (diff) | |
| parent | d4c7fc02f9f59e721e76debf4a595df529707545 (diff) | |
| download | ffmpeg-769b473a418638c74020998388b0be74f2ff1858.tar.gz | |
Merge commit 'd4c7fc02f9f59e721e76debf4a595df529707545'
* commit 'd4c7fc02f9f59e721e76debf4a595df529707545':
rtpenc: Skip redundant initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index e6dc87a7d3..360fa2cc93 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -199,7 +199,6 @@ static int rtp_write_header(AVFormatContext *s1) if (n < 1) n = 1; s->max_payload_size = n * TS_PACKET_SIZE; - s->buf_ptr = s->buf; break; case AV_CODEC_ID_H261: if (s1->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { @@ -232,7 +231,6 @@ static int rtp_write_header(AVFormatContext *s1) if (!s->max_frames_per_packet) s->max_frames_per_packet = 15; s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15); - s->num_frames = 0; break; case AV_CODEC_ID_ADPCM_G722: /* Due to a historical error, the clock rate for G722 in RTP is @@ -276,10 +274,8 @@ static int rtp_write_header(AVFormatContext *s1) av_log(s1, AV_LOG_ERROR, "Only mono is supported\n"); goto fail; } - s->num_frames = 0; break; case AV_CODEC_ID_AAC: - s->num_frames = 0; if (!s->max_frames_per_packet) s->max_frames_per_packet = 5; break; |