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
47cc1147
Commit
47cc1147
authored
Jun 11, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MKV: remove unused parameter
parent
b7b66146
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
modules/demux/mkv/mkv.cpp
modules/demux/mkv/mkv.cpp
+10
-8
No files found.
modules/demux/mkv/mkv.cpp
View file @
47cc1147
...
@@ -457,12 +457,14 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it
...
@@ -457,12 +457,14 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it
}
}
/* Utility function for BlockDecode */
/* Utility function for BlockDecode */
static
block_t
*
MemToBlock
(
demux_t
*
p_demux
,
uint8_t
*
p_mem
,
size_t
i_mem
,
size_t
offset
)
static
block_t
*
MemToBlock
(
uint8_t
*
p_mem
,
size_t
i_mem
,
size_t
offset
)
{
{
block_t
*
p_block
;
block_t
*
p_block
=
block_New
(
p_demux
,
i_mem
+
offset
);
if
(
!
(
p_block
=
block_New
(
p_demux
,
i_mem
+
offset
)
)
)
return
NULL
;
if
(
likely
(
p_block
!=
NULL
)
)
{
memcpy
(
p_block
->
p_buffer
+
offset
,
p_mem
,
i_mem
);
memcpy
(
p_block
->
p_buffer
+
offset
,
p_mem
,
i_mem
);
//p_block->i_rate = p_input->stream.control.i_rate;
//p_block->i_rate = p_input->stream.control.i_rate;
}
return
p_block
;
return
p_block
;
}
}
...
@@ -513,7 +515,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
...
@@ -513,7 +515,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
block_t
*
p_init
;
block_t
*
p_init
;
msg_Dbg
(
p_demux
,
"sending header (%d bytes)"
,
tk
->
i_data_init
);
msg_Dbg
(
p_demux
,
"sending header (%d bytes)"
,
tk
->
i_data_init
);
p_init
=
MemToBlock
(
p_demux
,
tk
->
p_data_init
,
tk
->
i_data_init
,
0
);
p_init
=
MemToBlock
(
tk
->
p_data_init
,
tk
->
i_data_init
,
0
);
if
(
p_init
)
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
p_init
);
if
(
p_init
)
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
p_init
);
}
}
tk
->
b_inited
=
true
;
tk
->
b_inited
=
true
;
...
@@ -539,9 +541,9 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
...
@@ -539,9 +541,9 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
break
;
break
;
if
(
tk
->
i_compression_type
==
MATROSKA_COMPRESSION_HEADER
&&
tk
->
p_compression_data
!=
NULL
)
if
(
tk
->
i_compression_type
==
MATROSKA_COMPRESSION_HEADER
&&
tk
->
p_compression_data
!=
NULL
)
p_block
=
MemToBlock
(
p_demux
,
data
->
Buffer
(),
data
->
Size
(),
tk
->
p_compression_data
->
GetSize
()
);
p_block
=
MemToBlock
(
data
->
Buffer
(),
data
->
Size
(),
tk
->
p_compression_data
->
GetSize
()
);
else
else
p_block
=
MemToBlock
(
p_demux
,
data
->
Buffer
(),
data
->
Size
(),
0
);
p_block
=
MemToBlock
(
data
->
Buffer
(),
data
->
Size
(),
0
);
if
(
p_block
==
NULL
)
if
(
p_block
==
NULL
)
{
{
...
...
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