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
28b94745
Commit
28b94745
authored
Dec 07, 2013
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: asf: fix signedness in language index
parent
e1df9cc6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+0
-1
modules/demux/asf/libasf.c
modules/demux/asf/libasf.c
+3
-3
modules/demux/asf/libasf.h
modules/demux/asf/libasf.h
+2
-2
No files found.
modules/demux/asf/asf.c
View file @
28b94745
...
...
@@ -1312,7 +1312,6 @@ static int DemuxInit( demux_t *p_demux )
if
(
fmt
.
i_cat
!=
UNKNOWN_ES
)
{
if
(
p_esp
&&
p_languages
&&
p_esp
->
i_language_index
>=
0
&&
p_esp
->
i_language_index
<
p_languages
->
i_language
)
{
fmt
.
psz_language
=
strdup
(
p_languages
->
ppsz_language
[
p_esp
->
i_language_index
]
);
...
...
modules/demux/asf/libasf.c
View file @
28b94745
...
...
@@ -769,7 +769,7 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
asf_object_language_list_t
*
p_ll
=
&
p_obj
->
language_list
;
const
uint8_t
*
p_peek
,
*
p_data
;
int
i_peek
;
in
t
i
;
uint16_
t
i
;
if
(
(
i_peek
=
stream_Peek
(
s
,
&
p_peek
,
p_ll
->
i_object_size
)
)
<
26
)
return
VLC_EGENERIC
;
...
...
@@ -793,7 +793,7 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
}
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"read
\"
language list object
\"
%
d
entries"
,
msg_Dbg
(
s
,
"read
\"
language list object
\"
%
u
entries"
,
p_ll
->
i_language
);
for
(
i
=
0
;
i
<
p_ll
->
i_language
;
i
++
)
msg_Dbg
(
s
,
" - '%s'"
,
...
...
@@ -805,7 +805,7 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
static
void
ASF_FreeObject_language_list
(
asf_object_t
*
p_obj
)
{
asf_object_language_list_t
*
p_ll
=
&
p_obj
->
language_list
;
in
t
i
;
uint16_
t
i
;
for
(
i
=
0
;
i
<
p_ll
->
i_language
;
i
++
)
FREENULL
(
p_ll
->
ppsz_language
[
i
]
);
...
...
modules/demux/asf/libasf.h
View file @
28b94745
...
...
@@ -230,7 +230,7 @@ typedef struct
typedef
struct
{
ASF_OBJECT_COMMON
in
t
i_language
;
uint16_
t
i_language
;
char
**
ppsz_language
;
}
asf_object_language_list_t
;
...
...
@@ -275,7 +275,7 @@ typedef struct
int32_t
i_flags
;
int16_t
i_stream_number
;
int16_t
i_language_index
;
u
int16_t
i_language_index
;
int64_t
i_average_time_per_frame
;
int
i_stream_name_count
;
...
...
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