description: don't use vlc_object_find()

[vlc] / src / input / demux.c

diff --git a/src/input/demux.c b/src/input/demux.c
index 675da9c1d5f57bf21d73f6e7acf6043e981a5e62..b0d7dae35e11704d09ac68a55ee524000c3899da 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -30,6 +30,7 @@
 #include <vlc_codec.h>
 #include <vlc_meta.h>
 #include <vlc_url.h>
+#include <vlc_modules.h>
 
 static bool SkipID3Tag( demux_t * );
 static bool SkipAPETag( demux_t *p_demux );
@@ -77,7 +78,7 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
     p_demux->psz_file = get_path( psz_location );
 
     /* Take into account "demux" to be able to do :demux=dump */
-    if( p_demux->psz_demux && *p_demux->psz_demux == '\0' )
+    if( *p_demux->psz_demux == '\0' )
     {
         free( p_demux->psz_demux );
         p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" );
@@ -311,6 +312,7 @@ int demux_vaControlHelper( stream_t *s,
             }
             return VLC_EGENERIC;
 
+        case DEMUX_GET_PTS_DELAY:
         case DEMUX_GET_FPS:
         case DEMUX_GET_META:
         case DEMUX_HAS_UNSUPPORTED_META: