Mercurial > mplayer.hg
changeset 17174:83a8c738be89
make demuxer seek and close functions return void, patch by Dominik Mierzejewski
| author | wanderer |
|---|---|
| date | Sun, 11 Dec 2005 17:21:02 +0000 |
| parents | 60a4b99ab1b7 |
| children | 3aea4bdfd0d0 |
| files | libmpdemux/demux_pva.c libmpdemux/demux_real.c libmpdemux/demux_ty.c libmpdemux/tv.c |
| diffstat | 4 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_pva.c Sun Dec 11 17:13:56 2005 +0000 +++ b/libmpdemux/demux_pva.c Sun Dec 11 17:21:02 2005 +0000 @@ -466,7 +466,7 @@ return 1; } -static int demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags) +static void demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags) { int total_bitrate=0; off_t dest_offset; @@ -490,7 +490,7 @@ if(!pva_sync(demuxer)) { mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: Couldn't seek!\n"); - return 0; + return; } /* @@ -501,8 +501,6 @@ priv->last_video_pts=-1; priv->last_audio_pts=-1; - - return 1; }
--- a/libmpdemux/demux_real.c Sun Dec 11 17:13:56 2005 +0000 +++ b/libmpdemux/demux_real.c Sun Dec 11 17:21:02 2005 +0000 @@ -1801,7 +1801,7 @@ } /* please upload RV10 samples WITH INDEX CHUNK */ -static int demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, int flags) +static void demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, int flags) { real_priv_t *priv = demuxer->priv; demux_stream_t *d_audio = demuxer->audio; @@ -1823,7 +1823,7 @@ // printf("streams: %d\n", streams); if (!streams) - return 0; + return; if (flags & 1) /* seek absolute */ @@ -1890,7 +1890,6 @@ stream_seek(demuxer->stream, next_offset); demux_real_fill_buffer(demuxer, NULL); - return 1; } static int demux_real_control(demuxer_t *demuxer, int cmd, void *arg)
--- a/libmpdemux/demux_ty.c Sun Dec 11 17:13:56 2005 +0000 +++ b/libmpdemux/demux_ty.c Sun Dec 11 17:21:02 2005 +0000 @@ -1360,7 +1360,7 @@ } -static int demux_close_ty( demuxer_t *demux ) +static void demux_close_ty( demuxer_t *demux ) { TiVoInfo *tivo = 0; @@ -1371,7 +1371,6 @@ demux->a_streams[ MAX_A_STREAMS - 1 ] = 0; sub_justify = 0; } - return( 0 ); }
--- a/libmpdemux/tv.c Sun Dec 11 17:13:56 2005 +0000 +++ b/libmpdemux/tv.c Sun Dec 11 17:21:02 2005 +0000 @@ -603,10 +603,10 @@ return demuxer; } -static int demux_close_tv(demuxer_t *demuxer) +static void demux_close_tv(demuxer_t *demuxer) { tvi_handle_t *tvh=(tvi_handle_t*)(demuxer->priv); - return(tvh->functions->uninit(tvh->priv)); + tvh->functions->uninit(tvh->priv); } /* ================== STREAM_TV ===================== */