[vlc-devel] commit: audio_format_t.i_flavor -> es_format_t.i_profile ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Jan 22 14:29:26 2010 +0100| [f173401f9d2324f1292b885bd577ee1cdd4fc57c] | committer: Rafaël Carré 

audio_format_t.i_flavor -> es_format_t.i_profile

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

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

 include/vlc_es.h     |    2 +-
 modules/demux/real.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 26c2f14..3c9260c 100644
--- 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 c4ef0db..fa6cc07 100644
--- 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;