m4a demuxer: initialize correctly p_sys

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index a603f12b96441dd413b5fea67d429346ef67af62..7e62c2c056d01e1c8742a535b1f89de5eb200ae5 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -39,6 +39,7 @@
 #   include <winsock2.h>
 #endif
 
+#include "UsageEnvironment.hh"
 #include "BasicUsageEnvironment.hh"
 #include "GroupsockHelper.hh"
 #include "liveMedia.hh"
@@ -743,7 +744,14 @@ static int SessionsSetup( demux_t *p_demux )
                 }
                 else if( !strcmp( sub->codecName(), "SPEEX" ) )
                 {
-                    tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', ' ' );
+                    tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', 'r' );
+                   if ( sub->rtpTimestampFrequency() )
+                       tk->fmt.audio.i_rate = sub->rtpTimestampFrequency();
+                    else
+                   {
+                       msg_Warn( p_demux,"Using 8kHz as default sample rate." );
+                       tk->fmt.audio.i_rate = 8000;
+                   }
                 }
             }
             else if( !strcmp( sub->mediumName(), "video" ) )
@@ -1033,12 +1041,10 @@ static int Demux( demux_t *p_demux )
 
             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
             tk->b_rtcp_sync = VLC_TRUE;
-#if 0
             /* reset PCR */
             tk->i_pts = 0;
             p_sys->i_pcr = 0;
             i_pcr = 0;
-#endif
         }
     }