X-Git-Url: https://git.sesse.net/?p=vlc;a=blobdiff_plain;f=modules%2Faccess%2Fdecklink.cpp;h=99ab7c2ef23e3af361263ee014a895f154c60825;hp=8c5c2a2d6a55e0f8bb670233dc7eeaaad155bf2e;hb=d09772f846f9250d7a1f04e58a48be8a76d8ece3;hpb=0623d0c27377ce615ea8d5a0a48354744d1370cb

diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index 8c5c2a2d6a..99ab7c2ef2 100644
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -220,8 +220,8 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame
             p_sys->i_last_pts = p_video_frame->i_pts;
         vlc_mutex_unlock( &p_sys->pts_lock );
 
-        es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_video_frame->i_pts );
-        es_out_Send( p_demux->out, p_sys->p_video_es, p_video_frame );
+        es_out_Control( p_demux_->out, ES_OUT_SET_PCR, p_video_frame->i_pts );
+        es_out_Send( p_demux_->out, p_sys->p_video_es, p_video_frame );
     }
 
     if( audioFrame )
@@ -251,8 +251,8 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame
         vlc_mutex_unlock( &p_sys->pts_lock );
         if( p_audio_frame->i_pts > p_sys->i_last_pts )
 
-        es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_audio_frame->i_pts );
-        es_out_Send( p_demux->out, p_sys->p_audio_es, p_audio_frame );
+        es_out_Control( p_demux_->out, ES_OUT_SET_PCR, p_audio_frame->i_pts );
+        es_out_Send( p_demux_->out, p_sys->p_audio_es, p_audio_frame );
     }
 
     return S_OK;
@@ -287,8 +287,7 @@ static int Open( vlc_object_t *p_this )
     if( !p_sys )
         return VLC_ENOMEM;
 
-    vlc_mutex_init( &p_sys->frame_lock );
-    vlc_cond_init( &p_sys->has_frame );
+    vlc_mutex_init( &p_sys->pts_lock );
 
     IDeckLinkIterator *decklink_iterator = CreateDeckLinkIteratorInstance();
     if( !decklink_iterator )
@@ -615,12 +614,6 @@ static void Close( vlc_object_t *p_this )
     if( p_sys->p_delegate )
         p_sys->p_delegate->Release();
 
-    if( p_sys->p_video_frame )
-        block_Release( p_sys->p_video_frame );
-
-    if( p_sys->p_audio_frame )
-        block_Release( p_sys->p_audio_frame );
-
     free( p_sys );
 }