RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cosmetics: Split/join multiline statements. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27082 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-06-16 10:49:40 +00:00
parent 11b1a351b3
commit 8cf83f75ee
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libmpdemux/demuxer.c
View File

@ -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);