vlc | branch: master | Francois Cartegnie <[email protected]> | Wed May 30 15:43:58 2018 +0200| [9942eeada278bfd4ed30f74093de2e4fc5ea63d0] | committer: Francois Cartegnie
demux: ogg: change to oggsd header check > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9942eeada278bfd4ed30f74093de2e4fc5ea63d0 --- modules/demux/ogg.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 4d52b3e194..ec484950d1 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -1181,7 +1181,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, demux_sys_t *p_sys = p_demux->p_sys; block_t *p_block; bool b_selected; - int i_header_len = 0; + long i_header_len = 0; if( p_oggpacket->bytes >= 7 && ! memcmp ( p_oggpacket->packet, "Annodex", 7 ) ) @@ -1440,16 +1440,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_block->i_pts = p_block->i_dts; } - if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS && - p_stream->fmt.i_codec != VLC_CODEC_SPEEX && - p_stream->fmt.i_codec != VLC_CODEC_OPUS && - p_stream->fmt.i_codec != VLC_CODEC_VP8 && - p_stream->fmt.i_codec != VLC_CODEC_FLAC && - p_stream->fmt.i_codec != VLC_CODEC_THEORA && - p_stream->fmt.i_codec != VLC_CODEC_DAALA && - p_stream->fmt.i_codec != VLC_CODEC_DIRAC && - p_stream->fmt.i_codec != VLC_CODEC_KATE && - p_stream->fmt.i_codec != VLC_CODEC_OGGSPOTS ) + if( p_stream->b_oggds ) { if( p_oggpacket->bytes <= 0 ) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
