From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Mon, 14 Jun 2010 16:36:51 +0000 (+0200)
Subject: fix unsupported shortcut syntax
X-Git-Tag: 1.2.0-pre1~6175
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=063895670b30de910d13a46942b3c902b36205b1;p=vlc

fix unsupported shortcut syntax

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
---

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 1468ba4a7c..afc8c47fec 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2869,7 +2869,8 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t *
 
     const char *psz_codec_description =
         vlc_fourcc_GetDescription( p_fmt_es->i_cat, p_fmt_es->i_codec );
-    const vlc_fourcc_t i_codec_fourcc = p_fmt_es->i_original_fourcc ?: p_fmt_es->i_codec;
+    const vlc_fourcc_t i_codec_fourcc = ( p_fmt_es->i_original_fourcc )?
+                               p_fmt_es->i_original_fourcc : p_fmt_es->i_codec;
     if( psz_codec_description )
         info_category_AddInfo( p_cat, _("Codec"), "%s (%.4s)",
                                psz_codec_description, (char*)&i_codec_fourcc );