Changeset 3b29796137d524c8efa30e8f0753b2934c38bd26

Timestamp:

02/18/08 18:14:27 (7 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1203354867 +0000

git-parent:

[b2bc5fb8a2fcabf00b6fa75452bc2cfc694c3f3a]

git-author:

Rafaël Carré <funman@videolan.org> 1203354867 +0000

Message:

compare the right amount of data, being a little bit more strict

Files:

• modules/demux/ogg.c (modified) (5 diffs)

modules/demux/ogg.c

@@ -284 +284 @@
-                if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
-                        oggpacket.bytes >= 7 &&
-6
+7
-                {
-                    Ogg_ReadTheoraHeader( p_stream, &oggpacket );
@@ -291 +291 @@
-                else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
-                        oggpacket.bytes >= 7 &&
-6
+7
-                {
-                    Ogg_ReadVorbisHeader( p_stream, &oggpacket );
@@ -783 +783 @@
-                /* Check for Vorbis header */
-                if( oggpacket.bytes >= 7 &&
-6
+7
-                {
-                    Ogg_ReadVorbisHeader( p_stream, &oggpacket );
@@ -789 +789 @@
-                }
-                /* Check for Speex header */
-7
+5
-                    ! memcmp( oggpacket.packet, "Speex", 5 ) )
-                {
@@ -833 +833 @@
-                /* Check for Theora header */
-                else if( oggpacket.bytes >= 7 &&
-6
+7
-                {
-                    Ogg_ReadTheoraHeader( p_stream, &oggpacket );