Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
3ccefd74
Commit
3ccefd74
authored
Jul 03, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Format string fixes
parent
26696085
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
21 additions
and
19 deletions
+21
-19
modules/access/v4l2/v4l2.c
modules/access/v4l2/v4l2.c
+1
-1
modules/access_filter/bandwidth.c
modules/access_filter/bandwidth.c
+1
-1
modules/codec/adpcm.c
modules/codec/adpcm.c
+1
-1
modules/codec/avcodec/audio.c
modules/codec/avcodec/audio.c
+1
-1
modules/codec/cinepak.c
modules/codec/cinepak.c
+1
-1
modules/codec/cvdsub.c
modules/codec/cvdsub.c
+8
-6
modules/codec/rawvideo.c
modules/codec/rawvideo.c
+1
-1
modules/codec/spudec/spudec.c
modules/codec/spudec/spudec.c
+1
-1
modules/codec/svcdsub.c
modules/codec/svcdsub.c
+5
-5
modules/demux/real.c
modules/demux/real.c
+1
-1
No files found.
modules/access/v4l2/v4l2.c
View file @
3ccefd74
...
@@ -1629,7 +1629,7 @@ static block_t* GrabAudio( demux_t *p_demux )
...
@@ -1629,7 +1629,7 @@ static block_t* GrabAudio( demux_t *p_demux )
/* Test for overrun */
/* Test for overrun */
if
(
i_correction_delta
>
p_sys
->
i_audio_max_frame_size
)
if
(
i_correction_delta
>
p_sys
->
i_audio_max_frame_size
)
{
{
msg_Warn
(
p_demux
,
"ALSA read overrun (%
d > %d
)"
,
msg_Warn
(
p_demux
,
"ALSA read overrun (%
zu > %zu
)"
,
i_correction_delta
,
p_sys
->
i_audio_max_frame_size
);
i_correction_delta
,
p_sys
->
i_audio_max_frame_size
);
i_correction_delta
=
p_sys
->
i_audio_max_frame_size
;
i_correction_delta
=
p_sys
->
i_audio_max_frame_size
;
snd_pcm_prepare
(
p_sys
->
p_alsa_pcm
);
snd_pcm_prepare
(
p_sys
->
p_alsa_pcm
);
...
...
modules/access_filter/bandwidth.c
View file @
3ccefd74
...
@@ -144,7 +144,7 @@ retry:
...
@@ -144,7 +144,7 @@ retry:
if
(
len
>
delta
)
if
(
len
>
delta
)
{
{
msg_Dbg
(
access
,
"reading %
u bytes instead of %u"
,
(
unsigned
)
delta
,
msg_Dbg
(
access
,
"reading %
"
PRIu64
" bytes instead of %zu"
,
delta
,
len
);
len
);
len
=
(
int
)
delta
;
len
=
(
int
)
delta
;
}
}
...
...
modules/codec/adpcm.c
View file @
3ccefd74
...
@@ -202,7 +202,7 @@ static int OpenDecoder( vlc_object_t *p_this )
...
@@ -202,7 +202,7 @@ static int OpenDecoder( vlc_object_t *p_this )
{
{
p_sys
->
i_block
=
(
p_sys
->
codec
==
ADPCM_IMA_QT
)
?
p_sys
->
i_block
=
(
p_sys
->
codec
==
ADPCM_IMA_QT
)
?
34
*
p_dec
->
fmt_in
.
audio
.
i_channels
:
1024
;
34
*
p_dec
->
fmt_in
.
audio
.
i_channels
:
1024
;
msg_Warn
(
p_dec
,
"block size undefined, using %
d
"
,
p_sys
->
i_block
);
msg_Warn
(
p_dec
,
"block size undefined, using %
zu
"
,
p_sys
->
i_block
);
}
}
else
else
{
{
...
...
modules/codec/avcodec/audio.c
View file @
3ccefd74
...
@@ -293,7 +293,7 @@ aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
...
@@ -293,7 +293,7 @@ aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
if
(
i_used
<
0
||
i_output
<
0
)
if
(
i_used
<
0
||
i_output
<
0
)
{
{
if
(
i_used
<
0
)
if
(
i_used
<
0
)
msg_Warn
(
p_dec
,
"cannot decode one frame (%
d
bytes)"
,
msg_Warn
(
p_dec
,
"cannot decode one frame (%
zu
bytes)"
,
p_block
->
i_buffer
);
p_block
->
i_buffer
);
block_Release
(
p_block
);
block_Release
(
p_block
);
...
...
modules/codec/cinepak.c
View file @
3ccefd74
...
@@ -154,7 +154,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -154,7 +154,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_block
->
p_buffer
);
p_block
->
p_buffer
);
if
(
i_status
<
0
)
if
(
i_status
<
0
)
{
{
msg_Warn
(
p_dec
,
"cannot decode one frame (%
d
bytes)"
,
msg_Warn
(
p_dec
,
"cannot decode one frame (%
zu
bytes)"
,
p_block
->
i_buffer
);
p_block
->
i_buffer
);
block_Release
(
p_block
);
block_Release
(
p_block
);
return
NULL
;
return
NULL
;
...
...
modules/codec/cvdsub.c
View file @
3ccefd74
...
@@ -220,7 +220,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
...
@@ -220,7 +220,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
if
(
p_block
->
i_buffer
<
SPU_HEADER_LEN
)
if
(
p_block
->
i_buffer
<
SPU_HEADER_LEN
)
{
{
msg_Dbg
(
p_dec
,
"invalid packet header (size %
d < %d
)"
,
msg_Dbg
(
p_dec
,
"invalid packet header (size %
zu < %u
)"
,
p_block
->
i_buffer
,
SPU_HEADER_LEN
);
p_block
->
i_buffer
,
SPU_HEADER_LEN
);
block_Release
(
p_block
);
block_Release
(
p_block
);
return
NULL
;
return
NULL
;
...
@@ -253,11 +253,11 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
...
@@ -253,11 +253,11 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
if
(
p_spu
->
i_buffer
!=
p_sys
->
i_spu_size
)
if
(
p_spu
->
i_buffer
!=
p_sys
->
i_spu_size
)
{
{
msg_Warn
(
p_dec
,
"SPU packets size=%
d should be %d
"
,
msg_Warn
(
p_dec
,
"SPU packets size=%
zu should be %zu
"
,
p_spu
->
i_buffer
,
p_sys
->
i_spu_size
);
p_spu
->
i_buffer
,
p_sys
->
i_spu_size
);
}
}
msg_Dbg
(
p_dec
,
"subtitle packet complete, size=%
d
"
,
p_spu
->
i_buffer
);
msg_Dbg
(
p_dec
,
"subtitle packet complete, size=%
zuu
"
,
p_spu
->
i_buffer
);
ParseMetaInfo
(
p_dec
,
p_spu
);
ParseMetaInfo
(
p_dec
,
p_spu
);
...
@@ -315,7 +315,7 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block )
...
@@ -315,7 +315,7 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block )
p_sys
->
i_image_length
=
p_sys
->
metadata_offset
-
p_sys
->
i_image_offset
;
p_sys
->
i_image_length
=
p_sys
->
metadata_offset
-
p_sys
->
i_image_offset
;
#ifdef DEBUG_CVDSUB
#ifdef DEBUG_CVDSUB
msg_Dbg
(
p_dec
,
"total size: %
d image size: %d
"
,
msg_Dbg
(
p_dec
,
"total size: %
zu image size: %zu
"
,
p_sys
->
i_spu_size
,
p_sys
->
i_image_length
);
p_sys
->
i_spu_size
,
p_sys
->
i_image_length
);
#endif
#endif
}
}
...
@@ -461,7 +461,8 @@ static void ParseMetaInfo( decoder_t *p_dec, block_t *p_spu )
...
@@ -461,7 +461,8 @@ static void ParseMetaInfo( decoder_t *p_dec, block_t *p_spu )
p_sys
->
first_field_offset
=
p_sys
->
first_field_offset
=
(
p
[
2
]
<<
8
)
+
p
[
3
]
-
p_sys
->
i_image_offset
;
(
p
[
2
]
<<
8
)
+
p
[
3
]
-
p_sys
->
i_image_offset
;
#ifdef DEBUG_CVDSUB
#ifdef DEBUG_CVDSUB
msg_Dbg
(
p_dec
,
"1st_field_offset %d"
,
p_sys
->
first_field_offset
);
msg_Dbg
(
p_dec
,
"1st_field_offset %zu"
,
p_sys
->
first_field_offset
);
#endif
#endif
break
;
break
;
...
@@ -471,7 +472,8 @@ static void ParseMetaInfo( decoder_t *p_dec, block_t *p_spu )
...
@@ -471,7 +472,8 @@ static void ParseMetaInfo( decoder_t *p_dec, block_t *p_spu )
p_sys
->
second_field_offset
=
p_sys
->
second_field_offset
=
(
p
[
2
]
<<
8
)
+
p
[
3
]
-
p_sys
->
i_image_offset
;
(
p
[
2
]
<<
8
)
+
p
[
3
]
-
p_sys
->
i_image_offset
;
#ifdef DEBUG_CVDSUB
#ifdef DEBUG_CVDSUB
msg_Dbg
(
p_dec
,
"2nd_field_offset %d"
,
p_sys
->
second_field_offset
);
msg_Dbg
(
p_dec
,
"2nd_field_offset %zu"
,
p_sys
->
second_field_offset
);
#endif
#endif
break
;
break
;
...
...
modules/codec/rawvideo.c
View file @
3ccefd74
...
@@ -229,7 +229,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -229,7 +229,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if
(
p_block
->
i_buffer
<
p_sys
->
i_raw_size
)
if
(
p_block
->
i_buffer
<
p_sys
->
i_raw_size
)
{
{
msg_Warn
(
p_dec
,
"invalid frame size (%
d < %d
)"
,
msg_Warn
(
p_dec
,
"invalid frame size (%
zu < %zu
)"
,
p_block
->
i_buffer
,
p_sys
->
i_raw_size
);
p_block
->
i_buffer
,
p_sys
->
i_raw_size
);
block_Release
(
p_block
);
block_Release
(
p_block
);
...
...
modules/codec/spudec/spudec.c
View file @
3ccefd74
...
@@ -206,7 +206,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block )
...
@@ -206,7 +206,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block )
(
p_block
->
i_pts
<=
0
||
p_block
->
i_buffer
<
4
)
)
(
p_block
->
i_pts
<=
0
||
p_block
->
i_buffer
<
4
)
)
{
{
msg_Dbg
(
p_dec
,
"invalid starting packet (size < 4 or pts <=0)"
);
msg_Dbg
(
p_dec
,
"invalid starting packet (size < 4 or pts <=0)"
);
msg_Dbg
(
p_dec
,
"spu size: %d, i_pts: %"
PRId64
" i_buffer: %
d
"
,
msg_Dbg
(
p_dec
,
"spu size: %d, i_pts: %"
PRId64
" i_buffer: %
zu
"
,
p_sys
->
i_spu_size
,
p_block
->
i_pts
,
p_block
->
i_buffer
);
p_sys
->
i_spu_size
,
p_block
->
i_pts
,
p_block
->
i_buffer
);
block_Release
(
p_block
);
block_Release
(
p_block
);
return
NULL
;
return
NULL
;
...
...
modules/codec/svcdsub.c
View file @
3ccefd74
...
@@ -261,7 +261,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
...
@@ -261,7 +261,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
if
(
p_block
->
i_buffer
<
SPU_HEADER_LEN
)
if
(
p_block
->
i_buffer
<
SPU_HEADER_LEN
)
{
{
msg_Dbg
(
p_dec
,
"invalid packet header (size %
d < %d
)"
,
msg_Dbg
(
p_dec
,
"invalid packet header (size %
zu < %u
)"
,
p_block
->
i_buffer
,
SPU_HEADER_LEN
);
p_block
->
i_buffer
,
SPU_HEADER_LEN
);
block_Release
(
p_block
);
block_Release
(
p_block
);
return
NULL
;
return
NULL
;
...
@@ -350,12 +350,12 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
...
@@ -350,12 +350,12 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
if
(
p_spu
->
i_buffer
!=
p_sys
->
i_spu_size
)
if
(
p_spu
->
i_buffer
!=
p_sys
->
i_spu_size
)
{
{
msg_Warn
(
p_dec
,
"subtitle packets size=%
d should be %d
"
,
msg_Warn
(
p_dec
,
"subtitle packets size=%
zu should be %zu
"
,
p_spu
->
i_buffer
,
p_sys
->
i_spu_size
);
p_spu
->
i_buffer
,
p_sys
->
i_spu_size
);
}
}
dbg_print
(
(
DECODE_DBG_PACKET
),
dbg_print
(
(
DECODE_DBG_PACKET
),
"subtitle packet complete, size=%
d
"
,
p_spu
->
i_buffer
);
"subtitle packet complete, size=%
zu
"
,
p_spu
->
i_buffer
);
p_sys
->
i_state
=
SUBTITLE_BLOCK_EMPTY
;
p_sys
->
i_state
=
SUBTITLE_BLOCK_EMPTY
;
p_sys
->
p_spu
=
0
;
p_sys
->
p_spu
=
0
;
...
@@ -437,10 +437,10 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block )
...
@@ -437,10 +437,10 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block )
if
(
p_sys
&&
p_sys
->
i_debug
&
DECODE_DBG_PACKET
)
if
(
p_sys
&&
p_sys
->
i_debug
&
DECODE_DBG_PACKET
)
{
{
msg_Dbg
(
p_dec
,
"x-start: %d, y-start: %d, width: %d, height %d, "
msg_Dbg
(
p_dec
,
"x-start: %d, y-start: %d, width: %d, height %d, "
"spu size: %
d, duration: %lu (d:%d p:%d
)"
,
"spu size: %
zu, duration: %"
PRIu64
" (d:%zu p:%"
PRIu16
"
)"
,
p_sys
->
i_x_start
,
p_sys
->
i_y_start
,
p_sys
->
i_x_start
,
p_sys
->
i_y_start
,
p_sys
->
i_width
,
p_sys
->
i_height
,
p_sys
->
i_width
,
p_sys
->
i_height
,
p_sys
->
i_spu_size
,
(
long
unsigned
int
)
p_sys
->
i_duration
,
p_sys
->
i_spu_size
,
p_sys
->
i_duration
,
p_sys
->
i_image_length
,
p_sys
->
i_image_offset
);
p_sys
->
i_image_length
,
p_sys
->
i_image_offset
);
for
(
i
=
0
;
i
<
4
;
i
++
)
for
(
i
=
0
;
i
<
4
;
i
++
)
...
...
modules/demux/real.c
View file @
3ccefd74
...
@@ -401,7 +401,7 @@ static int Demux( demux_t *p_demux )
...
@@ -401,7 +401,7 @@ static int Demux( demux_t *p_demux )
(
tk
->
p_frame
->
i_dts
!=
i_pts
||
(
tk
->
p_frame
->
i_dts
!=
i_pts
||
tk
->
i_frame
!=
i_len
)
)
tk
->
i_frame
!=
i_len
)
)
{
{
msg_Dbg
(
p_demux
,
"sending size=%
d
"
,
tk
->
p_frame
->
i_buffer
);
msg_Dbg
(
p_demux
,
"sending size=%
zu
"
,
tk
->
p_frame
->
i_buffer
);
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
tk
->
p_frame
);
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
tk
->
p_frame
);
...
...
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