har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'

Browse Source 
* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
	libavcodec/ratecontrol.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-12 13:32:13 +01:00
commit 15daa8f9dd
2 changed files with 580 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

997
libavcodec/ratecontrol.c
View File

File diff suppressed because it is too large Load Diff

2
libavformat/rtpdec.c
View File

@ -482,7 +482,7 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
s->ic = s1; s->ic = s1;
s->st = st; s->st = st;
s->queue_size = queue_size; s->queue_size = queue_size;
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? rtp_init_statistics(&s->statistics, 0);
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) {
s->ts = ff_mpegts_parse_open(s->ic); s->ts = ff_mpegts_parse_open(s->ic);
if (s->ts == NULL) { if (s->ts == NULL) {