Mercurial > mplayer.hg

changeset 27050:c9609bfa816a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Split/join multiline statements.
author diego
date Mon, 16 Jun 2008 10:49:40 +0000
parents 762a9c6bfb43
children 414d5a794c35
files libmpdemux/demuxer.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Mon Jun 16 10:31:05 2008 +0000
+++ b/libmpdemux/demuxer.c	Mon Jun 16 10:49:40 2008 +0000
@@ -506,7 +506,9 @@
         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 @@
   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 @@
   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);