[vlc-commits] commit: fix unsupported shortcut syntax (Francois Cartegnie )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jun 14 18:36:51 2010 +0200| [6a6a915e802e531a7817ed26c852a3d67afa0559] | committer: Jean-Baptiste Kempf 

fix unsupported shortcut syntax

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 063895670b30de910d13a46942b3c902b36205b1)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 src/input/es_out.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 1468ba4..afc8c47 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 );