X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=fb82d01fe39a4449ccbb258e28ba8adb5324325a;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=133494e55b411e55179bdd9997665fb35c8c4ac4;hpb=3305b049e7f587b23359a1c9047fb5763d19c1dc;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 133494e55b..fb82d01fe3 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -506,13 +506,13 @@ static void Ogg_DecodePacket( demux_t *p_demux, ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) ) { /* it's an Annodex packet -- skip it (do nothing) */ - return; + return; } else if( p_oggpacket->bytes >= 7 && ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) ) { /* it's an AnxData packet -- skip it (do nothing) */ - return; + return; } if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) && @@ -700,7 +700,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, } if( p_oggpacket->bytes - 1 - i_header_len > 2 || ( p_oggpacket->packet[i_header_len + 1] != ' ' && - p_oggpacket->packet[i_header_len + 1] != 0 && + p_oggpacket->packet[i_header_len + 1] != 0 && p_oggpacket->packet[i_header_len + 1] != '\n' && p_oggpacket->packet[i_header_len + 1] != '\r' ) ) {