Commit f173401f authored by Rafaël Carré's avatar 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
parent 6a893450
...@@ -93,7 +93,6 @@ struct audio_format_t ...@@ -93,7 +93,6 @@ struct audio_format_t
unsigned i_bitspersample; unsigned i_bitspersample;
unsigned i_blockalign; unsigned i_blockalign;
uint8_t i_channels; /* must be <=32 */ uint8_t i_channels; /* must be <=32 */
uint8_t i_flavor;
}; };
/** /**
...@@ -256,6 +255,7 @@ struct es_format_t ...@@ -256,6 +255,7 @@ struct es_format_t
subs_format_t subs; /**< description of subtitle format */ subs_format_t subs; /**< description of subtitle format */
unsigned int i_bitrate; /**< bitrate of this ES */ 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) */ bool b_packetized; /**< wether the data is packetized (ie. not truncated) */
int i_extra; /**< length in bytes of extra data pointer */ int i_extra; /**< length in bytes of extra data pointer */
......
...@@ -1490,7 +1490,7 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data ...@@ -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' ): case VLC_FOURCC( 's','i','p','r' ):
fmt.i_codec = VLC_CODEC_SIPR; fmt.i_codec = VLC_CODEC_SIPR;
fmt.audio.i_flavor = i_flavor; fmt.i_profile = i_flavor;
if( i_flavor > 3 ) if( i_flavor > 3 )
return VLC_EGENERIC; return VLC_EGENERIC;
......
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