[vlc-commits] demux: xiph comments: allow setting fmt descs

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Mar 14 02:26:33 2014 +0100| [d1b35f9efbfc489f48df43c078bf3fd9c2536912] | committer: Francois Cartegnie

demux: xiph comments: allow setting fmt descs

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

 modules/demux/flac.c          |    2 +-
 modules/demux/ogg.c           |    2 +-
 modules/demux/xiph_metadata.c |    2 +-
 modules/demux/xiph_metadata.h |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 261eed9..7340d07 100644
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -577,7 +577,7 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
     if( i_data < 4 )
         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_cover_score, &p_sys->i_cover_idx, NULL, NULL, NULL, NULL );
 }
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 8806f58..36ec242 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -2288,7 +2288,7 @@ static void Ogg_ExtractComments( demux_t *p_demux, es_format_t *p_fmt,
         pf_replay_gain[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,
                          &i_cover_score, &i_cover_idx,
                          &p_ogg->i_seekpoints, &p_ogg->pp_seekpoints,
diff --git a/modules/demux/xiph_metadata.c b/modules/demux/xiph_metadata.c
index a88b9b8..c160d9b 100644
--- a/modules/demux/xiph_metadata.c
+++ b/modules/demux/xiph_metadata.c
@@ -145,7 +145,7 @@ static seekpoint_t * getChapterEntry( unsigned int i_index, chapters_array_t *p_
     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,
         int *i_attachments, input_attachment_t ***attachments,
         int *i_cover_score, int *i_cover_idx,
diff --git a/modules/demux/xiph_metadata.h b/modules/demux/xiph_metadata.h
index 6e318f5..7a152b1 100644
--- a/modules/demux/xiph_metadata.h
+++ b/modules/demux/xiph_metadata.h
@@ -32,7 +32,7 @@ extern "C" {
 input_attachment_t* ParseFlacPicture( const uint8_t *p_data, int i_data,
     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,
         int *i_attachments, input_attachment_t ***attachments,
         int *i_cover_score, int *i_cover_idx,