Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
4d25e8a5
Commit
4d25e8a5
authored
Jan 22, 2016
by
Ghislain MARY
Browse files
Declare variables at the beginning of functions.
parent
5a4ae4dc
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/utils/mkv_reader.c
View file @
4d25e8a5
...
...
@@ -81,6 +81,7 @@ static void _mkv_track_reader_edit_seek(MKVTrackReader *obj);
MKVReader
*
mkv_reader_open
(
const
char
*
filename
)
{
MKVReader
*
obj
=
(
MKVReader
*
)
ms_new0
(
MKVReader
,
1
);
tchar_t
*
fname
;
int
err
;
ParserContext_Init
(
&
obj
->
p
,
NULL
,
NULL
,
NULL
);
...
...
@@ -91,14 +92,14 @@ MKVReader *mkv_reader_open(const char *filename) {
goto
fail
;
}
#ifdef UNICODE
tchar_t
*
fname
=
ms_malloc0
((
strlen
(
filename
)
+
1
)
*
sizeof
(
tchar_t
));
fname
=
ms_malloc0
((
strlen
(
filename
)
+
1
)
*
sizeof
(
tchar_t
));
#ifdef _WIN32
MultiByteToWideChar
(
CP_UTF8
,
0
,
filename
,
-
1
,
fname
,
strlen
(
filename
));
#else
mbstowcs
(
fname
,
filename
,
strlen
(
filename
));
#endif
#else
tchar_t
*
fname
=
filename
;
fname
=
(
tchar_t
*
)
filename
;
#endif
obj
->
file
=
StreamOpen
(
&
obj
->
p
,
fname
,
SFLAG_RDONLY
);
if
(
obj
->
file
==
NULL
)
{
...
...
@@ -468,12 +469,13 @@ fail:
}
static
int
_parse_segment_info
(
MKVSegmentInfo
*
seg_info_out
,
ebml_element
*
seg_info_elt
)
{
tchar_t
muxing_app
[
MAX_MKV_STRING_LENGTH
];
tchar_t
writing_app
[
MAX_MKV_STRING_LENGTH
];
if
(
!
EBML_MasterCheckMandatory
((
ebml_master
*
)
seg_info_elt
,
FALSE
))
{
ms_error
(
"MKVParser: fail to parse segment info. Missing elements"
);
return
-
1
;
}
tchar_t
muxing_app
[
MAX_MKV_STRING_LENGTH
];
tchar_t
writing_app
[
MAX_MKV_STRING_LENGTH
];
seg_info_out
->
duration
=
EBML_FloatValue
((
ebml_float
*
)
EBML_MasterFindChild
((
ebml_master
*
)
seg_info_elt
,
&
MATROSKA_ContextDuration
));
seg_info_out
->
timecode_scale
=
EBML_IntegerValue
((
ebml_integer
*
)
EBML_MasterGetChild
((
ebml_master
*
)
seg_info_elt
,
&
MATROSKA_ContextTimecodeScale
));
memset
(
muxing_app
,
0
,
sizeof
(
muxing_app
));
...
...
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