* ALL: compile fixes.

diff --git a/configure.ac b/configure.ac
index b045e6b647c16b227e4e5a8f9e3e212007fb03c8..2a3ee2250999a3bc5ea9393e381261d578a6b7f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1930,7 +1930,7 @@ then
       dnl  Use a custom faad
       AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
       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])
     else
       dnl  The given libfaad wasn't built

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 1cea9fa842399fb4ed0cf871311e07e490419abb..10aeef7e0bc53e85b2b7e4dfdb1cf31ea1b9ef14 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1408,7 +1408,6 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
 {
     if( ! strncmp( &p_oggpacket->packet[0], "Annodex", 7 ) )
     {
-        Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
         oggpack_buffer opb;
 
         uint16_t major_version;
@@ -1416,6 +1415,8 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
         uint64_t timebase_numerator;
         uint64_t timebase_denominator;
 
+        Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
+
         oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
         oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
         major_version = oggpack_read( &opb, 2*8 ); /* major version */