Commit 15daa8f9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f61272f0'

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

Conflicts:
	libavcodec/ratecontrol.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e730c3a2 f61272f0
This diff is collapsed.
...@@ -482,7 +482,7 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, ...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment