Commit 6a6a915e authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

fix unsupported shortcut syntax

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 063895670b30de910d13a46942b3c902b36205b1)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent f6e1a870
...@@ -2869,7 +2869,8 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t * ...@@ -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 = const char *psz_codec_description =
vlc_fourcc_GetDescription( p_fmt_es->i_cat, p_fmt_es->i_codec ); 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 ) if( psz_codec_description )
info_category_AddInfo( p_cat, _("Codec"), "%s (%.4s)", info_category_AddInfo( p_cat, _("Codec"), "%s (%.4s)",
psz_codec_description, (char*)&i_codec_fourcc ); psz_codec_description, (char*)&i_codec_fourcc );
......
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