[vlc-commits] dec: fix incompatible pointer type

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed May 16 13:58:39 2018 +0200| [88e21b944b3b1c408a822bc35d05a532d3e1d8c7] | committer: Thomas Guillem

dec: fix incompatible pointer type

Introduced by 86df4f3d1b56776d2c77e4c9da4c829f44fafca6

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=88e21b944b3b1c408a822bc35d05a532d3e1d8c7
---

 modules/stream_out/transcode/audio.c | 3 +--
 modules/stream_out/transcode/spu.c   | 3 +--
 modules/stream_out/transcode/video.c | 3 +--
 src/misc/image.c                     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index 1b2414f28f..55dc975e9e 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -156,7 +156,7 @@ static int transcode_audio_initialize_encoder( sout_stream_id_sys_t *id, sout_st
     return VLC_SUCCESS;
 }
 
-static int decoder_queue_audio( decoder_t *p_dec, block_t *p_audio )
+static void decoder_queue_audio( decoder_t *p_dec, block_t *p_audio )
 {
     sout_stream_id_sys_t *id = p_dec->p_queue_ctx;
 
@@ -164,7 +164,6 @@ static int decoder_queue_audio( decoder_t *p_dec, block_t *p_audio )
     *id->fifo.audio.last = p_audio;
     id->fifo.audio.last = &p_audio->p_next;
     vlc_mutex_unlock(&id->fifo.lock);
-    return 0;
 }
 
 static block_t *transcode_dequeue_all_audios( sout_stream_id_sys_t *id )
diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index 7ee05e8e3e..539c4f1828 100644
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -45,7 +45,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec,
     return p_subpicture;
 }
 
-static int decoder_queue_sub( decoder_t *p_dec, subpicture_t *p_spu )
+static void decoder_queue_sub( decoder_t *p_dec, subpicture_t *p_spu )
 {
     sout_stream_id_sys_t *id = p_dec->p_queue_ctx;
 
@@ -53,7 +53,6 @@ static int decoder_queue_sub( decoder_t *p_dec, subpicture_t *p_spu )
     *id->fifo.spu.last = p_spu;
     id->fifo.spu.last = &p_spu->p_next;
     vlc_mutex_unlock(&id->fifo.lock);
-    return 0;
 }
 
 static subpicture_t *transcode_dequeue_all_subs( sout_stream_id_sys_t *id )
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 9c2d59d507..323bdfcb01 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -152,7 +152,7 @@ static void* EncoderThread( void *obj )
     return NULL;
 }
 
-static int decoder_queue_video( decoder_t *p_dec, picture_t *p_pic )
+static void decoder_queue_video( decoder_t *p_dec, picture_t *p_pic )
 {
     sout_stream_id_sys_t *id = p_dec->p_queue_ctx;
 
@@ -160,7 +160,6 @@ static int decoder_queue_video( decoder_t *p_dec, picture_t *p_pic )
     *id->fifo.pic.last = p_pic;
     id->fifo.pic.last = &p_pic->p_next;
     vlc_mutex_unlock(&id->fifo.lock);
-    return 0;
 }
 
 static picture_t *transcode_dequeue_all_pics( sout_stream_id_sys_t *id )
diff --git a/src/misc/image.c b/src/misc/image.c
index 395b9d39cb..721a1e6118 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -121,11 +121,10 @@ void image_HandlerDelete( image_handler_t *p_image )
  *
  */
 
-static int ImageQueueVideo( decoder_t *p_dec, picture_t *p_pic )
+static void ImageQueueVideo( decoder_t *p_dec, picture_t *p_pic )
 {
     image_handler_t *p_image = p_dec->p_queue_ctx;
     picture_fifo_Push( p_image->outfifo, p_pic );
-    return 0;
 }
 
 static picture_t *ImageRead( image_handler_t *p_image, block_t *p_block,