diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-25 19:21:24 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-25 19:21:24 +0000 |
commit | 1f5bb6386e3d631f5a38ad29ed864c759cbe133f (patch) | |
tree | d29d6716c6bb3c7ee7b764b3b24c6722502da907 | |
parent | a894a32080549ebf6695fc32da6810c1005cb7f1 (diff) | |
download | mpv-1f5bb6386e3d631f5a38ad29ed864c759cbe133f.tar.bz2 mpv-1f5bb6386e3d631f5a38ad29ed864c759cbe133f.tar.xz |
demuxer.c: Remove useless code
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
-rw-r--r-- | libmpdemux/demuxer.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 537dfa448e..df90a626aa 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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) |