virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'd4c7fc02f9f59e721e76debf4a595df529707545'

Browse Source 
* commit 'd4c7fc02f9f59e721e76debf4a595df529707545':
  rtpenc: Skip redundant initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-01 01:24:23 +01:00
commit 769b473a41
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpenc.c
View File

@ -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;