Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
628764e9
Commit
628764e9
authored
Apr 30, 2015
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mkv: Utils: Remove trailing whitespaces
parent
8babc068
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
modules/demux/mkv/util.cpp
modules/demux/mkv/util.cpp
+7
-7
No files found.
modules/demux/mkv/util.cpp
View file @
628764e9
...
@@ -97,7 +97,7 @@ int32_t zlib_decompress_extra( demux_t * p_demux, mkv_track_t * tk )
...
@@ -97,7 +97,7 @@ int32_t zlib_decompress_extra( demux_t * p_demux, mkv_track_t * tk )
}
}
tk
->
p_extra_data
=
p_new_extra
;
tk
->
p_extra_data
=
p_new_extra
;
inflateEnd
(
&
d_stream
);
inflateEnd
(
&
d_stream
);
return
0
;
return
0
;
}
}
...
@@ -217,7 +217,7 @@ void handle_real_audio(demux_t * p_demux, mkv_track_t * p_tk, block_t * p_blk, m
...
@@ -217,7 +217,7 @@ void handle_real_audio(demux_t * p_demux, mkv_track_t * p_tk, block_t * p_blk, m
p_block
->
i_pts
=
VLC_TS_INVALID
;
p_block
->
i_pts
=
VLC_TS_INVALID
;
if
(
!
p_sys
->
i_subpacket
)
if
(
!
p_sys
->
i_subpacket
)
{
{
p_tk
->
i_last_dts
=
p_tk
->
i_last_dts
=
p_block
->
i_pts
=
i_pts
;
p_block
->
i_pts
=
i_pts
;
}
}
...
@@ -319,7 +319,7 @@ Cook_PrivateTrackData::~Cook_PrivateTrackData()
...
@@ -319,7 +319,7 @@ Cook_PrivateTrackData::~Cook_PrivateTrackData()
if
(
p_subpackets
[
i
]
)
if
(
p_subpackets
[
i
]
)
block_Release
(
p_subpackets
[
i
]
);
block_Release
(
p_subpackets
[
i
]
);
free
(
p_subpackets
);
free
(
p_subpackets
);
}
}
static
inline
void
fill_wvpk_block
(
uint16_t
version
,
uint32_t
block_samples
,
uint32_t
flags
,
static
inline
void
fill_wvpk_block
(
uint16_t
version
,
uint32_t
block_samples
,
uint32_t
flags
,
...
@@ -338,7 +338,7 @@ static inline void fill_wvpk_block(uint16_t version, uint32_t block_samples, uin
...
@@ -338,7 +338,7 @@ static inline void fill_wvpk_block(uint16_t version, uint32_t block_samples, uin
SetDWLE
(
dst
+
20
,
block_samples
);
SetDWLE
(
dst
+
20
,
block_samples
);
SetDWLE
(
dst
+
24
,
flags
);
SetDWLE
(
dst
+
24
,
flags
);
SetDWLE
(
dst
+
28
,
crc
);
SetDWLE
(
dst
+
28
,
crc
);
memcpy
(
dst
+
32
,
src
,
srclen
);
memcpy
(
dst
+
32
,
src
,
srclen
);
}
}
block_t
*
packetize_wavpack
(
mkv_track_t
*
p_tk
,
uint8_t
*
buffer
,
size_t
size
)
block_t
*
packetize_wavpack
(
mkv_track_t
*
p_tk
,
uint8_t
*
buffer
,
size_t
size
)
...
@@ -348,13 +348,13 @@ block_t * packetize_wavpack( mkv_track_t * p_tk, uint8_t * buffer, size_t size)
...
@@ -348,13 +348,13 @@ block_t * packetize_wavpack( mkv_track_t * p_tk, uint8_t * buffer, size_t size)
uint32_t
flags
;
uint32_t
flags
;
uint32_t
crc
;
uint32_t
crc
;
block_t
*
p_block
=
NULL
;
block_t
*
p_block
=
NULL
;
if
(
p_tk
->
i_extra_data
>=
2
)
if
(
p_tk
->
i_extra_data
>=
2
)
version
=
GetWLE
(
p_tk
->
p_extra_data
);
version
=
GetWLE
(
p_tk
->
p_extra_data
);
if
(
size
<
12
)
if
(
size
<
12
)
return
NULL
;
return
NULL
;
block_samples
=
GetDWLE
(
buffer
);
block_samples
=
GetDWLE
(
buffer
);
buffer
+=
4
;
buffer
+=
4
;
flags
=
GetDWLE
(
buffer
);
flags
=
GetDWLE
(
buffer
);
...
@@ -376,7 +376,7 @@ block_t * packetize_wavpack( mkv_track_t * p_tk, uint8_t * buffer, size_t size)
...
@@ -376,7 +376,7 @@ block_t * packetize_wavpack( mkv_track_t * p_tk, uint8_t * buffer, size_t size)
else
else
{
{
/* Multiblock */
/* Multiblock */
size_t
total_size
=
0
;
size_t
total_size
=
0
;
p_block
=
block_Alloc
(
0
);
p_block
=
block_Alloc
(
0
);
if
(
!
p_block
)
if
(
!
p_block
)
...
...
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