diff --git a/ChangeLog b/ChangeLog index 714235c878..cef9a11f9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-17 Thomas Vander Stichele + + * gst/subparse/gstsubparse.c: (parse_subrip), (parse_mpsub): + make the compiler happy + 2005-05-17 Wim Taymans * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_new): diff --git a/common b/common index 131c263212..67b7e6c0db 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 131c2632127e6f061b5270d8f80651782a4fdd13 +Subproject commit 67b7e6c0db99415e0440d0c576495641b53e976a diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c index 1a6376278b..7c0ba7d74c 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -379,6 +379,7 @@ parse_subrip (ParserState * state, const gchar * line) return NULL; default: g_assert_not_reached (); + return NULL; } } @@ -412,6 +413,7 @@ parse_mpsub (ParserState * state, const gchar * line) return NULL; default: g_assert_not_reached (); + return NULL; } }