summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-16 10:49:40 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-16 10:49:40 +0000
commit8cf83f75eeb40e13df57fc9ec3c4e51c0f68a6ca (patch)
tree5963385fd1d5783aef6a8c9b6f1a0fe721f7007b /libmpdemux/demuxer.c
parent11b1a351b369a590cf4f9b6ec6d8c31193209b8e (diff)
downloadmpv-8cf83f75eeb40e13df57fc9ec3c4e51c0f68a6ca.tar.bz2
mpv-8cf83f75eeb40e13df57fc9ec3c4e51c0f68a6ca.tar.xz
cosmetics: Split/join multiline statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27082 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 8728ae48d7..28701b702c 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -506,7 +506,9 @@ while (len > 0) {
x = len;
if (mem)
fast_memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x);
- bytes+=x;len-=x;ds->buffer_pos+=x;
+ bytes += x;
+ len -= x;
+ ds->buffer_pos += x;
}
}
return bytes;
@@ -571,7 +573,8 @@ void ds_free_packs(demux_stream_t *ds)
ds->current=NULL;
ds->buffer=NULL;
ds->buffer_pos=ds->buffer_size;
- ds->pts=0; ds->pts_bytes=0;
+ ds->pts = 0;
+ ds->pts_bytes = 0;
}
int ds_get_packet(demux_stream_t *ds, unsigned char **start)
@@ -898,8 +901,7 @@ demuxer_t *demux_open(stream_t *vs, int file_format, int audio_id,
int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ;
int demuxer_type;
int audio_demuxer_type = 0, sub_demuxer_type = 0;
- int demuxer_force = 0, audio_demuxer_force = 0,
- sub_demuxer_force = 0;
+ int demuxer_force = 0, audio_demuxer_force = 0, sub_demuxer_force = 0;
if ((demuxer_type = get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) {
mp_msg(MSGT_DEMUXER,MSGL_ERR,"-demuxer %s does not exist.\n",demuxer_name);