[MPlayer-cvslog] r27082 - trunk/libmpdemux/demuxer.c
diego
subversion at mplayerhq.hu
Mon Jun 16 12:49:40 CEST 2008
Author: diego
Date: Mon Jun 16 12:49:40 2008
New Revision: 27082
Log:
cosmetics: Split/join multiline statements.
Modified:
trunk/libmpdemux/demuxer.c
Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c (original)
+++ trunk/libmpdemux/demuxer.c Mon Jun 16 12:49:40 2008
@@ -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
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);
More information about the MPlayer-cvslog
mailing list