summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-28 09:52:19 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-28 09:52:19 +0000
commitc57f41569306f73babba5e4456548c96bea9b3be (patch)
tree01dc82308cb32a834ffffded8549546b4095067f /libmpdemux/demux_ts.c
parent6355be18bd92aef1d7c221b4d566f8e30aead7c8 (diff)
downloadmpv-c57f41569306f73babba5e4456548c96bea9b3be.tar.bz2
mpv-c57f41569306f73babba5e4456548c96bea9b3be.tar.xz
reformatted ts_parse() after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20483 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
-rw-r--r--libmpdemux/demux_ts.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 21b15bb97d..156ce704dd 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -2792,16 +2792,16 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
if(dvdsub_lang)
{
- if(!strcmp(dvdsub_lang, ""))
- asgn = 1;
- else
- {
- lang = pid_lang_from_pmt(priv, pid);
- if(lang != NULL)
- asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
+ if(!strcmp(dvdsub_lang, ""))
+ asgn = 1;
else
- asgn = 0;
- }
+ {
+ lang = pid_lang_from_pmt(priv, pid);
+ if(lang != NULL)
+ asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
+ else
+ asgn = 0;
+ }
}
if(asgn)
@@ -2887,19 +2887,19 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
return 0;
tss->payload_size = es->payload_size;
- tss->type = es->type;
- tss->subtype = es->subtype;
-
- if(is_audio)
- lang = pid_lang_from_pmt(priv, es->pid);
- if(lang != NULL)
- {
- memcpy(es->lang, lang, 3);
- es->lang[3] = 0;
- }
- else
- es->lang[0] = 0;
- return 1;
+ tss->type = es->type;
+ tss->subtype = es->subtype;
+
+ if(is_audio)
+ lang = pid_lang_from_pmt(priv, es->pid);
+ if(lang != NULL)
+ {
+ memcpy(es->lang, lang, 3);
+ es->lang[3] = 0;
+ }
+ else
+ es->lang[0] = 0;
+ return 1;
}
else
{
@@ -2915,18 +2915,18 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
demuxer->filepos = stream_tell(demuxer->stream) - es->size;
- if(*dp_offset + es->size > *buffer_size)
- {
- *buffer_size = *dp_offset + es->size + TS_FEC_PACKET_SIZE;
- resize_demux_packet(*dp, *buffer_size);
- //we'll skip at least one RESIZE() in the next iteration of ts_parse()
- mp_msg(MSGT_DEMUX, MSGL_DBG2, "RESIZE DP TO %d\n", *buffer_size);
- }
- memcpy(&((*dp)->buffer[*dp_offset]), es->start, es->size);
- *dp_offset += es->size;
- (*dp)->flags = 0;
- (*dp)->pos = stream_tell(demuxer->stream);
- (*dp)->pts = es->pts;
+ if(*dp_offset + es->size > *buffer_size)
+ {
+ *buffer_size = *dp_offset + es->size + TS_FEC_PACKET_SIZE;
+ resize_demux_packet(*dp, *buffer_size);
+ //we'll skip at least one RESIZE() in the next iteration of ts_parse()
+ mp_msg(MSGT_DEMUX, MSGL_DBG2, "RESIZE DP TO %d\n", *buffer_size);
+ }
+ memcpy(&((*dp)->buffer[*dp_offset]), es->start, es->size);
+ *dp_offset += es->size;
+ (*dp)->flags = 0;
+ (*dp)->pos = stream_tell(demuxer->stream);
+ (*dp)->pts = es->pts;
if(*dp_offset >= MAX_PACK_BYTES)
{