Commit 2d1483b4 authored by Sam Hocevar's avatar Sam Hocevar

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

    + Fixed compiler warnings.
parent 10840a4a
......@@ -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,
......
......@@ -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 );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment