Commit d1b35f9e authored by Francois Cartegnie's avatar Francois Cartegnie

demux: xiph comments: allow setting fmt descs

parent 797a58b1
...@@ -577,7 +577,7 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data ) ...@@ -577,7 +577,7 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
if( i_data < 4 ) if( i_data < 4 )
return; return;
vorbis_ParseComment( &p_sys->p_meta, &p_data[4], i_data - 4, vorbis_ParseComment( NULL, &p_sys->p_meta, &p_data[4], i_data - 4,
&p_sys->i_attachments, &p_sys->attachments, &p_sys->i_attachments, &p_sys->attachments,
&p_sys->i_cover_score, &p_sys->i_cover_idx, NULL, NULL, NULL, NULL ); &p_sys->i_cover_score, &p_sys->i_cover_idx, NULL, NULL, NULL, NULL );
} }
......
...@@ -2288,7 +2288,7 @@ static void Ogg_ExtractComments( demux_t *p_demux, es_format_t *p_fmt, ...@@ -2288,7 +2288,7 @@ static void Ogg_ExtractComments( demux_t *p_demux, es_format_t *p_fmt,
pf_replay_gain[i] = 0; pf_replay_gain[i] = 0;
pf_replay_peak[i] = 0; pf_replay_peak[i] = 0;
} }
vorbis_ParseComment( &p_ogg->p_meta, p_headers, i_headers, vorbis_ParseComment( p_fmt, &p_ogg->p_meta, p_headers, i_headers,
&p_ogg->i_attachments, &p_ogg->attachments, &p_ogg->i_attachments, &p_ogg->attachments,
&i_cover_score, &i_cover_idx, &i_cover_score, &i_cover_idx,
&p_ogg->i_seekpoints, &p_ogg->pp_seekpoints, &p_ogg->i_seekpoints, &p_ogg->pp_seekpoints,
......
...@@ -145,7 +145,7 @@ static seekpoint_t * getChapterEntry( unsigned int i_index, chapters_array_t *p_ ...@@ -145,7 +145,7 @@ static seekpoint_t * getChapterEntry( unsigned int i_index, chapters_array_t *p_
return p_array->pp_chapters[i_index]; return p_array->pp_chapters[i_index];
} }
void vorbis_ParseComment( vlc_meta_t **pp_meta, void vorbis_ParseComment( es_format_t *p_fmt, vlc_meta_t **pp_meta,
const uint8_t *p_data, int i_data, const uint8_t *p_data, int i_data,
int *i_attachments, input_attachment_t ***attachments, int *i_attachments, input_attachment_t ***attachments,
int *i_cover_score, int *i_cover_idx, int *i_cover_score, int *i_cover_idx,
......
...@@ -32,7 +32,7 @@ extern "C" { ...@@ -32,7 +32,7 @@ extern "C" {
input_attachment_t* ParseFlacPicture( const uint8_t *p_data, int i_data, input_attachment_t* ParseFlacPicture( const uint8_t *p_data, int i_data,
int i_attachments, int *i_cover_score, int *i_cover_idx ); int i_attachments, int *i_cover_score, int *i_cover_idx );
void vorbis_ParseComment( vlc_meta_t **pp_meta, void vorbis_ParseComment( es_format_t *p_fmt, vlc_meta_t **pp_meta,
const uint8_t *p_data, int i_data, const uint8_t *p_data, int i_data,
int *i_attachments, input_attachment_t ***attachments, int *i_attachments, input_attachment_t ***attachments,
int *i_cover_score, int *i_cover_idx, int *i_cover_score, int *i_cover_idx,
......
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