[vlc-commits] es_out: remove tautology

Rémi Denis-Courmont git at videolan.org
Sat Nov 5 10:34:25 CET 2016


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov  5 11:24:07 2016 +0200| [d71b632d519658b5d677e3dde0097999c4d8f12d] | committer: Rémi Denis-Courmont

es_out: remove tautology

sout is only instantiated when not preparsing.

More generally, a lot of special cases for preparsing could be
eliminated if preparsing used a dedicated ES output back-end, but that
is way beyond the scope of this patch.

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

 src/input/es_out.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 12ccc7b..18934d6 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1444,7 +1444,7 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta )
     if( psz_arturl != NULL && !strncmp( psz_arturl, "attachment://", 13 ) )
     {   /* Clear art cover if streaming out.
          * FIXME: Why? Remove this when sout gets meta data support. */
-        if( input_priv(p_input)->p_sout && !p_input->b_preparsing )
+        if( input_priv(p_input)->p_sout != NULL )
             input_item_SetArtURL( p_item, NULL );
         else
             input_ExtractAttachmentAndCacheArt( p_input, psz_arturl + 13 );



More information about the vlc-commits mailing list