[vlc-commits] decoder: fix build without ENABLE_SOUT

Thomas Guillem git at videolan.org
Tue Dec 22 15:52:23 CET 2015


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Dec 22 15:51:29 2015 +0100| [619d1d9dfc5dacc9ca3991e23db589defaa778b2] | committer: Thomas Guillem

decoder: fix build without ENABLE_SOUT

This fixes a regression from d3db4b7fd3acabd60f61b5dd2bf7cbe3f77ce0ab

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=619d1d9dfc5dacc9ca3991e23db589defaa778b2
---

 src/input/decoder.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 5be414d..266102d 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1954,9 +1954,12 @@ bool input_DecoderIsEmpty( decoder_t * p_dec )
     bool b_empty;
 
     vlc_mutex_lock( &p_owner->lock );
+#ifdef ENABLE_SOUT
     if( p_owner->p_sout_input != NULL )
         b_empty = sout_InputIsEmpty( p_owner->p_sout_input );
-    else if( p_owner->fmt.i_cat == VIDEO_ES && p_owner->p_vout != NULL )
+    else
+#endif
+    if( p_owner->fmt.i_cat == VIDEO_ES && p_owner->p_vout != NULL )
         b_empty = vout_IsEmpty( p_owner->p_vout );
     else if( p_owner->fmt.i_cat == AUDIO_ES )
         b_empty = atomic_load( &p_owner->drained );



More information about the vlc-commits mailing list