]> git.sesse.net Git - vlc/commitdiff
Fix compile error in SDI module.
authorSteinar Gunderson <sgunderson@bigfoot.com>
Fri, 24 Sep 2010 21:40:16 +0000 (23:40 +0200)
committerSteinar Gunderson <sgunderson@bigfoot.com>
Fri, 24 Sep 2010 21:40:16 +0000 (23:40 +0200)
modules/access/sdi.cpp

index 0613bf8f626b6af87a099838867383bd7fc7f0bf..7146608b8d3e631c6fd55428a81cf9426fee8f45 100644 (file)
@@ -84,6 +84,8 @@ struct demux_sys_t
     int i_width, i_height, i_fps_num, i_fps_den;
     // FIXME: field dominance
 
+    int i_rate, i_channels;
+
     vlc_mutex_t frame_lock;
     block_t *p_video_frame;  // protected by <frame_lock>
     block_t *p_audio_frame;  // protected by <frame_lock>
@@ -347,11 +349,11 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
    
-    int i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" );
-    int i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" );
-    if( i_rate > 0 && i_channels > 0 )
+    p_sys->i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" );
+    p_sys->i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" );
+    if( p_sys->i_rate > 0 && p_sys->i_channels > 0 )
     {
-        result = p_sys->p_input->EnableAudioInput( i_rate, bmdAudioSampleType16bitInteger, i_channels );
+        result = p_sys->p_input->EnableAudioInput( p_sys->i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels );
         if( result != S_OK )
         {
             msg_Err( p_demux, "Failed to enable audio input" );
@@ -386,8 +388,8 @@ static int Open( vlc_object_t *p_this )
     
     es_format_t audio_fmt;
     es_format_Init( &audio_fmt, AUDIO_ES, VLC_CODEC_S16N );
-    audio_fmt.audio.i_channels = i_channels;
-    audio_fmt.audio.i_rate = i_rate;
+    audio_fmt.audio.i_channels = p_sys->i_channels;
+    audio_fmt.audio.i_rate = p_sys->i_rate;
     audio_fmt.audio.i_bitspersample = 16;
     audio_fmt.audio.i_blockalign = audio_fmt.audio.i_channels * audio_fmt.audio.i_bitspersample / 8;
     audio_fmt.i_bitrate = audio_fmt.audio.i_channels * audio_fmt.audio.i_rate * audio_fmt.audio.i_bitspersample;