* modules/demux/util/id3tag.c modules/codec/ffmpeg/demux.c:

    + Fixed compiler warnings.

diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c
index 5ab066c918fea38f7807d6a62d880aae359076c5..82424f7a6a4792165ee126745c276e526a4b9efb 100644 (file)
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -37,6 +37,8 @@
 #   include <avformat.h>
 #endif
 
+#include "ffmpeg.h"
+
 /* Version checking */
 #if (LIBAVFORMAT_BUILD >= 4611) && defined(HAVE_LIBAVFORMAT)
 
@@ -134,9 +136,11 @@ int E_(OpenDemux)( vlc_object_t *p_this )
     p_sys->url.prot = &p_sys->prot;
     p_sys->url.prot->name = "VLC I/O wrapper";
     p_sys->url.prot->url_open = 0;
-    p_sys->url.prot->url_read = IORead;
+    p_sys->url.prot->url_read =
+                    (int (*) (URLContext *, unsigned char *, int))IORead;
     p_sys->url.prot->url_write = 0;
-    p_sys->url.prot->url_seek = IOSeek;
+    p_sys->url.prot->url_seek =
+                    (offset_t (*) (URLContext *, offset_t, int))IOSeek;
     p_sys->url.prot->url_close = 0;
     p_sys->url.prot->next = 0;
     init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,

diff --git a/modules/demux/util/id3tag.c b/modules/demux/util/id3tag.c
index 7f5acc5360644360a2f48487366e3c55a82a3ecf..26a14a83ed0de6c4aadb171605fbfb74eff0a6de 100644 (file)
--- a/modules/demux/util/id3tag.c
+++ b/modules/demux/util/id3tag.c
@@ -72,7 +72,7 @@ static void ParseID3Tag( demux_t *p_demux, uint8_t *p_data, int i_size )
                                 FIND_PARENT );
     if( !p_input)
     {
-        return VLC_EGENERIC;
+        return;
     }
 
     var_Get( p_input, "demuxed-id3", &val );