X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fes_out.c;h=7f8b108cec87075155e3df3170327a223da609c3;hp=86cf9e4c6d52d7305db5f46258a639b277a48f7c;hb=31a92955712f448c2fc50bc45e663d11768de602;hpb=e481f91027724e63d86391cb65e008359c8a8f97 diff --git a/src/input/es_out.c b/src/input/es_out.c index 86cf9e4c6d..7f8b108cec 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "input_internal.h" #include "clock.h" @@ -2677,8 +2678,15 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t * input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Original ID"), "%d", es->i_id ); - input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Codec"), - "%.4s", (char*)&p_fmt_es->i_codec ); + 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; + if( psz_codec_description ) + input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Codec"), + "%s (%.4s)", psz_codec_description, (char*)&i_codec_fourcc ); + else + input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Codec"), + "%.4s", (char*)&i_codec_fourcc ); if( es->psz_language && *es->psz_language ) input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Language"),