From: Laurent Aimar <fenrir@videolan.org>
Date: Sat, 1 May 2010 22:09:19 +0000 (+0200)
Subject: Improved audio codec description from fourcc.
X-Git-Tag: 1.2.0-pre1~6809
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=792054ae5cebe62b1a7269d0006eee821c066532;p=vlc

Improved audio codec description from fourcc.
---

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 8d348b1509..8d644a1822 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1453,7 +1453,12 @@ static es_out_id_t *EsOutAdd( es_out_t *out, const es_format_t *fmt )
         es->fmt.i_id = out->p_sys->i_id;
     if( !es->fmt.i_original_fourcc )
         es->fmt.i_original_fourcc = es->fmt.i_codec;
-    es->fmt.i_codec = vlc_fourcc_GetCodec( es->fmt.i_cat, es->fmt.i_codec );
+    if( es->fmt.i_cat == AUDIO_ES )
+        es->fmt.i_codec = vlc_fourcc_GetCodecAudio( es->fmt.i_codec,
+                                                    es->fmt.audio.i_bitspersample );
+    else
+        es->fmt.i_codec = vlc_fourcc_GetCodec( es->fmt.i_cat,
+                                               es->fmt.i_codec );
 
     es->i_id = es->fmt.i_id;
     es->i_meta_id = out->p_sys->i_id;