Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
d1b35f9e
Commit
d1b35f9e
authored
Mar 14, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: xiph comments: allow setting fmt descs
parent
797a58b1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
modules/demux/flac.c
modules/demux/flac.c
+1
-1
modules/demux/ogg.c
modules/demux/ogg.c
+1
-1
modules/demux/xiph_metadata.c
modules/demux/xiph_metadata.c
+1
-1
modules/demux/xiph_metadata.h
modules/demux/xiph_metadata.h
+1
-1
No files found.
modules/demux/flac.c
View file @
d1b35f9e
...
@@ -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
);
}
}
...
...
modules/demux/ogg.c
View file @
d1b35f9e
...
@@ -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
,
...
...
modules/demux/xiph_metadata.c
View file @
d1b35f9e
...
@@ -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
,
...
...
modules/demux/xiph_metadata.h
View file @
d1b35f9e
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment