audio_format_t.i_flavor -> es_format_t.i_profile

Other (audio or video) demux/codecs than real demux can use it

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 26c2f14fca8150c968061fc247d613481c1dda20..3c9260ce2562489d04623ad68a69e6dd33f991ee 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -93,7 +93,6 @@ struct audio_format_t
     unsigned     i_bitspersample;
     unsigned     i_blockalign;
     uint8_t      i_channels; /* must be <=32 */
-    uint8_t      i_flavor;
 };
 
 /**
@@ -256,6 +255,7 @@ struct es_format_t
     subs_format_t  subs;      /**< description of subtitle format */
 
     unsigned int   i_bitrate; /**< bitrate of this ES */
+    int      i_profile;       /**< codec specific information (like real audio flavor, mpeg audio layer, h264 profile ...) */
 
     bool     b_packetized;  /**< wether the data is packetized (ie. not truncated) */
     int     i_extra;        /**< length in bytes of extra data pointer */

diff --git a/modules/demux/real.c b/modules/demux/real.c
index c4ef0dbcd23a523dd47b828ef9cf3f4a166bc330..fa6cc0777288fe58a63c6ed22260eaaf34e7cf7f 100644 (file)
--- a/modules/demux/real.c
+++ b/modules/demux/real.c
@@ -1490,7 +1490,7 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
 
     case VLC_FOURCC( 's','i','p','r' ):
         fmt.i_codec = VLC_CODEC_SIPR;
-        fmt.audio.i_flavor = i_flavor;
+        fmt.i_profile = i_flavor;
         if( i_flavor > 3 )
             return VLC_EGENERIC;