virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

rtpenc: Skip redundant initialization

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2015-02-26 13:37:56 +02:00
parent f8c01257f9
commit d4c7fc02f9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpenc.c
View File

@@ -196,7 +196,6 @@ static int rtp_write_header(AVFormatContext *s1)
if (n < 1) if (n < 1)
n = 1; n = 1;
s->max_payload_size = n * TS_PACKET_SIZE; s->max_payload_size = n * TS_PACKET_SIZE;
s->buf_ptr = s->buf;
break; break;
case AV_CODEC_ID_H261: case AV_CODEC_ID_H261:
if (s1->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { if (s1->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
@@ -229,7 +228,6 @@ static int rtp_write_header(AVFormatContext *s1)
if (!s->max_frames_per_packet) if (!s->max_frames_per_packet)
s->max_frames_per_packet = 15; s->max_frames_per_packet = 15;
s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15); s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15);
s->num_frames = 0;
break; break;
case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_ADPCM_G722:
/* Due to a historical error, the clock rate for G722 in RTP is /* Due to a historical error, the clock rate for G722 in RTP is
@@ -273,10 +271,8 @@ static int rtp_write_header(AVFormatContext *s1)
av_log(s1, AV_LOG_ERROR, "Only mono is supported\n"); av_log(s1, AV_LOG_ERROR, "Only mono is supported\n");
goto fail; goto fail;
} }
s->num_frames = 0;
break; break;
case AV_CODEC_ID_AAC: case AV_CODEC_ID_AAC:
s->num_frames = 0;
if (!s->max_frames_per_packet) if (!s->max_frames_per_packet)
s->max_frames_per_packet = 5; s->max_frames_per_packet = 5;
break; break;