diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-31 00:33:37 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-31 00:33:37 +0000 |
| commit | 40b0872a56d2177de8d305bf4f3fa34255b723aa (patch) | |
| tree | 80215579724f1cd9932d18c7cd6b54e94f562a7c /libavformat/mpegts.c | |
| parent | 64ab5fa3df570aa94563d3ba3c8334b7e288254d (diff) | |
| download | ffmpeg-40b0872a56d2177de8d305bf4f3fa34255b723aa.tar.gz | |
cosmetics, reindent, remove useless braces, whitespaces
Originally committed as revision 19002 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index cb90c891c5..a6e87c19cf 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -622,27 +622,26 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len stream_type, pid); /* now create ffmpeg stream */ - if(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES){ - pes= ts->pids[pid]->u.pes_filter.opaque; - st= pes->st; - }else{ - if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably - pes = add_pes_stream(ts, pid, pcr_pid, stream_type); - if (pes) - st = new_pes_av_stream(pes, 0); - } - add_pid_to_pmt(ts, h->id, pid); - if(st) - av_program_add_stream_index(ts->stream, h->id, st->index); + if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) { + pes= ts->pids[pid]->u.pes_filter.opaque; + st= pes->st; + } else { + if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably + pes = add_pes_stream(ts, pid, pcr_pid, stream_type); + if (pes) + st = new_pes_av_stream(pes, 0); + } + + add_pid_to_pmt(ts, h->id, pid); - if (st) { - if (language[0] != 0) { + if(st) { + av_program_add_stream_index(ts->stream, h->id, st->index); + + if (language[0] != 0) av_metadata_set(&st->metadata, "language", language); - } - if (stream_type == STREAM_TYPE_SUBTITLE_DVB) { + if (stream_type == STREAM_TYPE_SUBTITLE_DVB) st->codec->sub_id = (anc_page << 16) | comp_page; - } } } /* all parameters are there */ |