Commit 855c0ab2 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

meta reader: Always run if we don't have meta from access or demux.

parent edd9673a
...@@ -2747,18 +2747,22 @@ static void InputSourceMeta( input_thread_t *p_input, ...@@ -2747,18 +2747,22 @@ static void InputSourceMeta( input_thread_t *p_input,
/* XXX Remember that checking against p_item->p_meta->i_status & ITEM_PREPARSED /* XXX Remember that checking against p_item->p_meta->i_status & ITEM_PREPARSED
* is a bad idea */ * is a bad idea */
bool has_meta;
/* Read access meta */ /* Read access meta */
if( p_access ) if( p_access )
access_Control( p_access, ACCESS_GET_META, p_meta ); has_meta = !access_Control( p_access, ACCESS_GET_META, p_meta );
/* Read demux meta */ /* Read demux meta */
demux_Control( p_demux, DEMUX_GET_META, p_meta ); has_meta = (!demux_Control( p_demux, DEMUX_GET_META, p_meta )) || has_meta;
/* If the demux report unsupported meta data, try an external "meta reader" */ bool has_unsupported;
bool b_bool; if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &has_unsupported ) )
if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) ) has_unsupported = true;
return;
if( !b_bool ) /* If the demux report unsupported meta data, or if we don't have meta data
* try an external "meta reader" */
if( has_meta && !has_unsupported )
return; return;
demux_meta_t *p_demux_meta = demux_meta_t *p_demux_meta =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment