[vlc-commits] remove warnings

Rafaël Carré git at videolan.org
Sun Jun 19 17:59:17 CEST 2011


vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Jun 19 11:52:18 2011 -0400| [03a0c3a2b52ce8e1e8bc4f18d440592aecb23e56] | committer: Rafaël Carré

remove warnings

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

 src/input/input.c          |    2 +-
 src/video_output/display.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index efe6b8e..d3af598 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2185,7 +2185,7 @@ static bool Control( input_thread_t *p_input,
                      p_input->p->input.p_stream )
             {
                 const uint64_t i_size = stream_Size( p_input->p->input.p_stream );
-                if( i_size > 0 && bookmark.i_byte_offset <= i_size )
+                if( i_size > 0 && (uint64_t)bookmark.i_byte_offset <= i_size )
                 {
                     val.f_float = (double)bookmark.i_byte_offset / i_size;
                     b_force_update = Control( p_input, INPUT_CONTROL_SET_POSITION, val );
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 4260d29..6d8449d 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -539,6 +539,9 @@ static void VoutDisplayEventMouse(vout_display_t *vd, int event, va_list args)
     vlc_mutex_unlock(&osys->lock);
 }
 
+#ifdef __GNUC__
+static void *VoutDisplayEventKeyDispatch(void *data) __attribute__((noreturn));
+#endif
 static void *VoutDisplayEventKeyDispatch(void *data)
 {
     vout_display_owner_sys_t *osys = data;
@@ -1470,6 +1473,7 @@ static void SplitterDisplay(vout_display_t *vd,
 }
 static int SplitterControl(vout_display_t *vd, int query, va_list args)
 {
+    (void)vd; (void)query; (void)args;
     return VLC_EGENERIC;
 }
 static void SplitterManage(vout_display_t *vd)



More information about the vlc-commits mailing list