From a8235fce3f208eecfa4750650c1ef13a4c0567f2 Mon Sep 17 00:00:00 2001
From: wanderer <wanderer@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 11 Dec 2005 17:21:02 +0000
Subject: make demuxer seek and close functions return void, patch by Dominik
 Mierzejewski

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17175 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_pva.c  | 6 ++----
 libmpdemux/demux_real.c | 5 ++---
 libmpdemux/demux_ty.c   | 3 +--
 libmpdemux/tv.c         | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c
index 2a2a47d881..fe831885ad 100644
--- a/libmpdemux/demux_pva.c
+++ b/libmpdemux/demux_pva.c
@@ -466,7 +466,7 @@ int pva_get_payload(demuxer_t * d,pva_payload_t * payload)
 	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 @@ static int demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags)
 	if(!pva_sync(demuxer))
 	{
 		mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: Couldn't seek!\n");
-		return 0;
+		return;
 	}
 	
 	/*
@@ -501,8 +501,6 @@ static int demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags)
 	
 	priv->last_video_pts=-1;
 	priv->last_audio_pts=-1;
-	
-	return 1;
 }
 
 
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 1e07e8bd75..0d6ce85a75 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -1801,7 +1801,7 @@ static void demux_close_real(demuxer_t *demuxer)
 }
 
 /* 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 @@ static int demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, int flags)
 //    printf("streams: %d\n", streams);
 
     if (!streams)
-	return 0;
+	return;
 
     if (flags & 1)
 	/* seek absolute */
@@ -1890,7 +1890,6 @@ static int demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, int flags)
         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)
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index f23d4000b5..d505357bfa 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -1360,7 +1360,7 @@ int demux_ty_control( demuxer_t *demuxer,int cmd, void *arg )
 }
 
 
-static int demux_close_ty( demuxer_t *demux )
+static void demux_close_ty( demuxer_t *demux )
 {
    TiVoInfo         *tivo = 0;
 
@@ -1371,7 +1371,6 @@ static int demux_close_ty( demuxer_t *demux )
       demux->a_streams[ MAX_A_STREAMS - 1 ] = 0;
 	   sub_justify = 0;
    }
-   return( 0 );
 }
 
 
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index 678d8c584b..15054dc73c 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -603,10 +603,10 @@ no_audio:
     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 ===================== */
-- 
cgit v1.2.3