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
68d880d7
Commit
68d880d7
authored
Aug 19, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings in lpcm, cc and theora
parent
fe9d2fd9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
modules/codec/cc.c
modules/codec/cc.c
+2
-1
modules/codec/lpcm.c
modules/codec/lpcm.c
+4
-6
modules/codec/theora.c
modules/codec/theora.c
+3
-3
No files found.
modules/codec/cc.c
View file @
68d880d7
...
@@ -618,7 +618,7 @@ static void Eia608ParseChannel( eia608_t *h, const uint8_t d[2] )
...
@@ -618,7 +618,7 @@ static void Eia608ParseChannel( eia608_t *h, const uint8_t d[2] )
/* */
/* */
const
int
d1
=
d
[
0
]
&
0x7f
;
const
int
d1
=
d
[
0
]
&
0x7f
;
const
int
d2
=
d
[
1
]
&
0x7f
;
//
const int d2 = d[1] & 0x7f;
if
(
d1
==
0x14
)
if
(
d1
==
0x14
)
h
->
i_channel
=
1
;
h
->
i_channel
=
1
;
else
if
(
d1
==
0x1c
)
else
if
(
d1
==
0x1c
)
...
@@ -1143,5 +1143,6 @@ static char *Eia608Text( eia608_t *h, bool b_html )
...
@@ -1143,5 +1143,6 @@ static char *Eia608Text( eia608_t *h, bool b_html )
static
void
Eia608Exit
(
eia608_t
*
h
)
static
void
Eia608Exit
(
eia608_t
*
h
)
{
{
VLC_UNUSED
(
h
);
}
}
modules/codec/lpcm.c
View file @
68d880d7
...
@@ -289,12 +289,11 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
...
@@ -289,12 +289,11 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
}
}
int
i_ret
;
int
i_ret
;
unsigned
i_padding
;
unsigned
i_padding
=
0
;
aob_group_t
p_aob_group
[
2
];
aob_group_t
p_aob_group
[
2
];
switch
(
p_sys
->
i_type
)
switch
(
p_sys
->
i_type
)
{
{
case
LPCM_VOB
:
case
LPCM_VOB
:
i_padding
=
0
;
i_ret
=
VobHeader
(
&
i_rate
,
&
i_channels
,
&
i_original_channels
,
&
i_bits
,
i_ret
=
VobHeader
(
&
i_rate
,
&
i_channels
,
&
i_original_channels
,
&
i_bits
,
p_block
->
p_buffer
);
p_block
->
p_buffer
);
break
;
break
;
...
@@ -303,13 +302,12 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
...
@@ -303,13 +302,12 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
p_aob_group
,
p_aob_group
,
p_block
->
p_buffer
);
p_block
->
p_buffer
);
break
;
break
;
default:
assert
(
0
);
case
LPCM_BD
:
case
LPCM_BD
:
i_padding
=
0
;
i_ret
=
BdHeader
(
&
i_rate
,
&
i_channels
,
&
i_original_channels
,
&
i_bits
,
i_ret
=
BdHeader
(
&
i_rate
,
&
i_channels
,
&
i_original_channels
,
&
i_bits
,
p_block
->
p_buffer
);
p_block
->
p_buffer
);
break
;
break
;
default:
assert
(
0
);
}
}
if
(
i_ret
||
p_block
->
i_buffer
<=
p_sys
->
i_header_size
+
i_padding
)
if
(
i_ret
||
p_block
->
i_buffer
<=
p_sys
->
i_header_size
+
i_padding
)
...
@@ -792,7 +790,7 @@ static void AobExtract( aout_buffer_t *p_aout_buffer,
...
@@ -792,7 +790,7 @@ static void AobExtract( aout_buffer_t *p_aout_buffer,
for
(
int
i
=
0
;
i
<
2
;
i
++
)
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
{
const
aob_group_t
*
g
=
&
p_group
[
1
-
i
];
const
aob_group_t
*
g
=
&
p_group
[
1
-
i
];
const
int
i_group_size
=
2
*
g
->
i_channels
*
i_bits
/
8
;
const
unsigned
int
i_group_size
=
2
*
g
->
i_channels
*
i_bits
/
8
;
if
(
p_block
->
i_buffer
<
i_group_size
)
if
(
p_block
->
i_buffer
<
i_group_size
)
{
{
...
...
modules/codec/theora.c
View file @
68d880d7
...
@@ -82,7 +82,7 @@ static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** );
...
@@ -82,7 +82,7 @@ static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** );
static
picture_t
*
DecodePacket
(
decoder_t
*
,
ogg_packet
*
);
static
picture_t
*
DecodePacket
(
decoder_t
*
,
ogg_packet
*
);
static
void
ParseTheoraComments
(
decoder_t
*
);
static
void
ParseTheoraComments
(
decoder_t
*
);
static
void
theora_CopyPicture
(
decoder_t
*
,
picture_t
*
,
yuv_buffer
*
);
static
void
theora_CopyPicture
(
picture_t
*
,
yuv_buffer
*
);
static
int
OpenEncoder
(
vlc_object_t
*
p_this
);
static
int
OpenEncoder
(
vlc_object_t
*
p_this
);
static
void
CloseEncoder
(
vlc_object_t
*
p_this
);
static
void
CloseEncoder
(
vlc_object_t
*
p_this
);
...
@@ -498,7 +498,7 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
...
@@ -498,7 +498,7 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
p_pic
=
decoder_NewPicture
(
p_dec
);
p_pic
=
decoder_NewPicture
(
p_dec
);
if
(
!
p_pic
)
return
NULL
;
if
(
!
p_pic
)
return
NULL
;
theora_CopyPicture
(
p_
dec
,
p_
pic
,
&
yuv
);
theora_CopyPicture
(
p_pic
,
&
yuv
);
p_pic
->
date
=
p_sys
->
i_pts
;
p_pic
->
date
=
p_sys
->
i_pts
;
...
@@ -553,7 +553,7 @@ static void CloseDecoder( vlc_object_t *p_this )
...
@@ -553,7 +553,7 @@ static void CloseDecoder( vlc_object_t *p_this )
* theora_CopyPicture: copy a picture from theora internal buffers to a
* theora_CopyPicture: copy a picture from theora internal buffers to a
* picture_t structure.
* picture_t structure.
*****************************************************************************/
*****************************************************************************/
static
void
theora_CopyPicture
(
decoder_t
*
p_dec
,
picture_t
*
p_pic
,
static
void
theora_CopyPicture
(
picture_t
*
p_pic
,
yuv_buffer
*
yuv
)
yuv_buffer
*
yuv
)
{
{
int
i_plane
,
i_line
,
i_dst_stride
,
i_src_stride
;
int
i_plane
,
i_line
,
i_dst_stride
,
i_src_stride
;
...
...
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