mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

demuxer.c: Remove useless code

Browse Source 
Remove "while(1) { }" around two instances of code that always do
"return" in the loop body. No functionality changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
uau 2007-10-25 19:21:24 +00:00
parent a894a32080
commit 1f5bb6386e
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libmpdemux/demuxer.c
View File

@ -526,20 +526,18 @@ void ds_free_packs(demux_stream_t *ds){
}
int ds_get_packet(demux_stream_t *ds,unsigned char **start){
while(1){
int len;
if(ds->buffer_pos>=ds->buffer_size){
if(!ds_fill_buffer(ds)){
int len;
if(ds->buffer_pos>=ds->buffer_size){
if(!ds_fill_buffer(ds)){
// EOF
*start = NULL;
return -1;
}
}
len=ds->buffer_size-ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
ds->buffer_pos+=len;
return len;
}
}
len=ds->buffer_size-ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
ds->buffer_pos+=len;
return len;
}
int ds_get_packet_pts(demux_stream_t *ds,unsigned char **start, double *pts)
@ -564,18 +562,16 @@ int ds_get_packet_pts(demux_stream_t *ds,unsigned char **start, double *pts)
}
int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){
while(1){
int len;
if(ds->buffer_pos>=ds->buffer_size){
*start = NULL;
if(!ds->packs) return -1; // no sub
if(!ds_fill_buffer(ds)) return -1; // EOF
}
len=ds->buffer_size-ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
ds->buffer_pos+=len;
return len;
int len;
if(ds->buffer_pos>=ds->buffer_size){
*start = NULL;
if(!ds->packs) return -1; // no sub
if(!ds_fill_buffer(ds)) return -1; // EOF
}
len=ds->buffer_size-ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
ds->buffer_pos+=len;
return len;
}
double ds_get_next_pts(demux_stream_t *ds)