Dominique Leuenberger
c7b62e518f
- Update to version 2.2.1 OBS-URL: https://build.opensuse.org/request/show/295709 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=121
103 lines
3.0 KiB
Diff
103 lines
3.0 KiB
Diff
diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
|
|
index 73af8ce..8ffad6f 100644
|
|
--- a/modules/access/v4l2/demux.c
|
|
+++ b/modules/access/v4l2/demux.c
|
|
@@ -629,6 +629,7 @@ static void *MmapThread (void *data)
|
|
}
|
|
|
|
assert (0);
|
|
+ return NULL; /* dead code, but the compiler can't know */
|
|
}
|
|
|
|
static void *ReadThread (void *data)
|
|
@@ -691,6 +692,7 @@ static void *ReadThread (void *data)
|
|
#endif
|
|
}
|
|
assert (0);
|
|
+ return NULL; /* dead code, but the compiler can't know */
|
|
}
|
|
|
|
static int DemuxControl( demux_t *demux, int query, va_list args )
|
|
diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
|
|
index 8d7dc6e..cc924aa 100644
|
|
--- a/modules/control/dbus/dbus.c
|
|
+++ b/modules/control/dbus/dbus.c
|
|
@@ -880,6 +880,7 @@ static void *Run( void *data )
|
|
vlc_restorecancel( canc );
|
|
}
|
|
assert(0);
|
|
+ return NULL; /* dead code, but the compiler can't know */
|
|
}
|
|
|
|
static void wakeup_main_loop( void *p_data )
|
|
diff --git a/modules/control/motion.c b/modules/control/motion.c
|
|
index 72d7ec6..49c5620 100644
|
|
--- a/modules/control/motion.c
|
|
+++ b/modules/control/motion.c
|
|
@@ -190,6 +190,7 @@ static void *RunIntf( void *data )
|
|
vlc_restorecancel( canc );
|
|
}
|
|
assert(0);
|
|
+ return NULL; /* dead code, but the compiler can't know */
|
|
}
|
|
#undef LOW_THRESHOLD
|
|
#undef HIGH_THRESHOLD
|
|
diff --git a/modules/control/motionlib.c b/modules/control/motionlib.c
|
|
index 9d24ced..b087410 100644
|
|
--- a/modules/control/motionlib.c
|
|
+++ b/modules/control/motionlib.c
|
|
@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensors_t *motion )
|
|
default:
|
|
assert( 0 );
|
|
}
|
|
+ return 0; /* dead code, but the compiler can't know */
|
|
}
|
|
|
|
/*****************************************************************************
|
|
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
|
|
index 62c89b7..81f884a 100644
|
|
--- a/modules/stream_out/rtp.c
|
|
+++ b/modules/stream_out/rtp.c
|
|
@@ -1501,6 +1501,7 @@ static void *rtp_listen_thread( void *data )
|
|
}
|
|
|
|
assert( 0 );
|
|
+ return NULL; /* dead code, but the compiler can't know */
|
|
}
|
|
|
|
|
|
diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
|
|
index 0baa2bc..6b788cb 100644
|
|
--- a/modules/visualization/visual/visual.c
|
|
+++ b/modules/visualization/visual/visual.c
|
|
@@ -366,6 +366,7 @@ static void *Thread( void *data )
|
|
vlc_restorecancel( canc );
|
|
}
|
|
assert(0);
|
|
+ return NULL;
|
|
}
|
|
|
|
static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
|
|
diff --git a/src/misc/events.c b/src/misc/events.c
|
|
index b430ee5..29c387f 100644
|
|
--- a/src/misc/events.c
|
|
+++ b/src/misc/events.c
|
|
@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_t * p_em,
|
|
FOREACH_END()
|
|
/* Unknown event = BUG */
|
|
assert( 0 );
|
|
+ return 0;
|
|
}
|
|
|
|
/**
|
|
--- a/modules/demux/mp4/mp4.c.orig 2015-04-13 16:35:15.220228877 +0200
|
|
+++ b/modules/demux/mp4/mp4.c 2015-04-13 16:35:15.255228142 +0200
|
|
@@ -277,6 +277,7 @@
|
|
|
|
i_sample -= ck->p_sample_count_pts[i_index];
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
static inline int64_t MP4_GetMoviePTS(demux_sys_t *p_sys )
|