diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:32:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:32:13 +0100 |
| commit | 15daa8f9ddaf678b924ebe997f7b62381c0e2e0a (patch) | |
| tree | a61799d00fe85fbc8ef097a6dcec6dc704c79235 /libavformat/rtpdec.c | |
| parent | e730c3a2cbc4070f3e1799d2a6789f239f7377b1 (diff) | |
| parent | f61272f0efd80da437570aad2c40e00f9d3f4fe6 (diff) | |
Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'
* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
ratecontrol: K&R cosmetic formatting
rtpdec: Remove a useless todo comment
Conflicts:
libavcodec/ratecontrol.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 13ad4aa127..17e2e87bd3 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -482,7 +482,7 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, s->ic = s1; s->st = st; 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")) { s->ts = ff_mpegts_parse_open(s->ic); if (s->ts == NULL) { |