Skip to content

V
vlc-2-2
Commit 5aedd620 authored by Jon Lech Johansen's avatar Jon Lech Johansen
Browse files
Options

* ALL: compile fixes.

parent 48856e6e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
configure.ac
View file @ 5aedd620
...@@ -1930,7 +1930,7 @@ then ...@@ -1930,7 +1930,7 @@ then
dnl Use a custom faad dnl Use a custom faad
AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
AX_ADD_BUILTINS([faad]) AX_ADD_BUILTINS([faad])
AX_ADD_LDFLAGS([faad],[-L${real_faad_tree}/libfaad/.libs/libfaad.a]) AX_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a])
AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include]) AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include])
else else
dnl The given libfaad wasn't built dnl The given libfaad wasn't built
......
modules/demux/ogg.c
View file @ 5aedd620
...@@ -1408,7 +1408,6 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, ...@@ -1408,7 +1408,6 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
{ {
if( ! strncmp( &p_oggpacket->packet[0], "Annodex", 7 ) ) if( ! strncmp( &p_oggpacket->packet[0], "Annodex", 7 ) )
{ {
Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
oggpack_buffer opb; oggpack_buffer opb;
uint16_t major_version; uint16_t major_version;
...@@ -1416,6 +1415,8 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, ...@@ -1416,6 +1415,8 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
uint64_t timebase_numerator; uint64_t timebase_numerator;
uint64_t timebase_denominator; uint64_t timebase_denominator;
Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */ oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
major_version = oggpack_read( &opb, 2*8 ); /* major version */ major_version = oggpack_read( &opb, 2*8 ); /* major version */
......
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