Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
0b77a593
Commit
0b77a593
authored
Dec 21, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use correct printf conversion specifiers for POSIX integer types
parent
92db5083
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
19 additions
and
19 deletions
+19
-19
dxv.c
libavcodec/dxv.c
+1
-1
hqx.c
libavcodec/hqx.c
+1
-1
mpegaudiodec_template.c
libavcodec/mpegaudiodec_template.c
+1
-1
parser.c
libavcodec/parser.c
+2
-2
pngdec.c
libavcodec/pngdec.c
+1
-1
vorbisdec.c
libavcodec/vorbisdec.c
+3
-3
wmaprodec.c
libavcodec/wmaprodec.c
+2
-2
mov.c
libavformat/mov.c
+1
-1
movenc.c
libavformat/movenc.c
+1
-1
mux.c
libavformat/mux.c
+1
-1
omaenc.c
libavformat/omaenc.c
+1
-1
rmdec.c
libavformat/rmdec.c
+1
-1
rpl.c
libavformat/rpl.c
+2
-2
xwma.c
libavformat/xwma.c
+1
-1
No files found.
libavcodec/dxv.c
View file @
0b77a593
...
@@ -366,7 +366,7 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
...
@@ -366,7 +366,7 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
break
;
break
;
case
MKBETAG
(
'Y'
,
'C'
,
'G'
,
'6'
):
case
MKBETAG
(
'Y'
,
'C'
,
'G'
,
'6'
):
case
MKBETAG
(
'Y'
,
'G'
,
'1'
,
'0'
):
case
MKBETAG
(
'Y'
,
'G'
,
'1'
,
'0'
):
avpriv_report_missing_feature
(
avctx
,
"Tag 0x%08
X
"
,
tag
);
avpriv_report_missing_feature
(
avctx
,
"Tag 0x%08
"
PRIX32
"
"
,
tag
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
default:
default:
/* Old version does not have a real header, just size and type. */
/* Old version does not have a real header, just size and type. */
...
...
libavcodec/hqx.c
View file @
0b77a593
...
@@ -417,7 +417,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -417,7 +417,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data,
info_tag
=
AV_RL32
(
src
);
info_tag
=
AV_RL32
(
src
);
if
(
info_tag
==
MKTAG
(
'I'
,
'N'
,
'F'
,
'O'
))
{
if
(
info_tag
==
MKTAG
(
'I'
,
'N'
,
'F'
,
'O'
))
{
u
nsigned
info_offset
=
AV_RL32
(
src
+
4
);
u
int32_t
info_offset
=
AV_RL32
(
src
+
4
);
if
(
info_offset
>
INT_MAX
||
info_offset
+
8
>
avpkt
->
size
)
{
if
(
info_offset
>
INT_MAX
||
info_offset
+
8
>
avpkt
->
size
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"Invalid INFO header offset: 0x%08"
PRIX32
" is too large.
\n
"
,
"Invalid INFO header offset: 0x%08"
PRIX32
" is too large.
\n
"
,
...
...
libavcodec/mpegaudiodec_template.c
View file @
0b77a593
...
@@ -274,7 +274,7 @@ static av_cold void decode_init_static(void)
...
@@ -274,7 +274,7 @@ static av_cold void decode_init_static(void)
scale_factor_mult
[
i
][
0
]
=
MULLx
(
norm
,
FIXR
(
1
.
0
*
2
.
0
),
FRAC_BITS
);
scale_factor_mult
[
i
][
0
]
=
MULLx
(
norm
,
FIXR
(
1
.
0
*
2
.
0
),
FRAC_BITS
);
scale_factor_mult
[
i
][
1
]
=
MULLx
(
norm
,
FIXR
(
0
.
7937005259
*
2
.
0
),
FRAC_BITS
);
scale_factor_mult
[
i
][
1
]
=
MULLx
(
norm
,
FIXR
(
0
.
7937005259
*
2
.
0
),
FRAC_BITS
);
scale_factor_mult
[
i
][
2
]
=
MULLx
(
norm
,
FIXR
(
0
.
6299605249
*
2
.
0
),
FRAC_BITS
);
scale_factor_mult
[
i
][
2
]
=
MULLx
(
norm
,
FIXR
(
0
.
6299605249
*
2
.
0
),
FRAC_BITS
);
ff_dlog
(
NULL
,
"%d: norm=%x s=%
x %x %x
\n
"
,
i
,
norm
,
ff_dlog
(
NULL
,
"%d: norm=%x s=%
"
PRIx32
" %"
PRIx32
" %"
PRIx32
"
\n
"
,
i
,
norm
,
scale_factor_mult
[
i
][
0
],
scale_factor_mult
[
i
][
0
],
scale_factor_mult
[
i
][
1
],
scale_factor_mult
[
i
][
1
],
scale_factor_mult
[
i
][
2
]);
scale_factor_mult
[
i
][
2
]);
...
...
libavcodec/parser.c
View file @
0b77a593
...
@@ -228,7 +228,7 @@ int ff_combine_frame(ParseContext *pc, int next,
...
@@ -228,7 +228,7 @@ int ff_combine_frame(ParseContext *pc, int next,
const
uint8_t
**
buf
,
int
*
buf_size
)
const
uint8_t
**
buf
,
int
*
buf_size
)
{
{
if
(
pc
->
overread
)
{
if
(
pc
->
overread
)
{
ff_dlog
(
NULL
,
"overread %d, state:%
X
next:%d index:%d o_index:%d
\n
"
,
ff_dlog
(
NULL
,
"overread %d, state:%
"
PRIX32
"
next:%d index:%d o_index:%d
\n
"
,
pc
->
overread
,
pc
->
state
,
next
,
pc
->
index
,
pc
->
overread_index
);
pc
->
overread
,
pc
->
state
,
next
,
pc
->
index
,
pc
->
overread_index
);
ff_dlog
(
NULL
,
"%X %X %X %X
\n
"
,
ff_dlog
(
NULL
,
"%X %X %X %X
\n
"
,
(
*
buf
)[
0
],
(
*
buf
)[
1
],
(
*
buf
)[
2
],
(
*
buf
)[
3
]);
(
*
buf
)[
0
],
(
*
buf
)[
1
],
(
*
buf
)[
2
],
(
*
buf
)[
3
]);
...
@@ -285,7 +285,7 @@ int ff_combine_frame(ParseContext *pc, int next,
...
@@ -285,7 +285,7 @@ int ff_combine_frame(ParseContext *pc, int next,
}
}
if
(
pc
->
overread
)
{
if
(
pc
->
overread
)
{
ff_dlog
(
NULL
,
"overread %d, state:%
X
next:%d index:%d o_index:%d
\n
"
,
ff_dlog
(
NULL
,
"overread %d, state:%
"
PRIX32
"
next:%d index:%d o_index:%d
\n
"
,
pc
->
overread
,
pc
->
state
,
next
,
pc
->
index
,
pc
->
overread_index
);
pc
->
overread
,
pc
->
state
,
next
,
pc
->
index
,
pc
->
overread_index
);
ff_dlog
(
NULL
,
"%X %X %X %X
\n
"
,
ff_dlog
(
NULL
,
"%X %X %X %X
\n
"
,
(
*
buf
)[
0
],
(
*
buf
)[
1
],
(
*
buf
)[
2
],
(
*
buf
)[
3
]);
(
*
buf
)[
0
],
(
*
buf
)[
1
],
(
*
buf
)[
2
],
(
*
buf
)[
3
]);
...
...
libavcodec/pngdec.c
View file @
0b77a593
...
@@ -453,7 +453,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -453,7 +453,7 @@ static int decode_frame(AVCodecContext *avctx,
if
(
length
>
0x7fffffff
)
if
(
length
>
0x7fffffff
)
goto
fail
;
goto
fail
;
tag
=
bytestream2_get_le32
(
&
s
->
gb
);
tag
=
bytestream2_get_le32
(
&
s
->
gb
);
ff_dlog
(
avctx
,
"png: tag=%c%c%c%c length=%
u
\n
"
,
ff_dlog
(
avctx
,
"png: tag=%c%c%c%c length=%
"
PRIu32
"
\n
"
,
(
tag
&
0xff
),
(
tag
&
0xff
),
((
tag
>>
8
)
&
0xff
),
((
tag
>>
8
)
&
0xff
),
((
tag
>>
16
)
&
0xff
),
((
tag
>>
16
)
&
0xff
),
...
...
libavcodec/vorbisdec.c
View file @
0b77a593
...
@@ -715,7 +715,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
...
@@ -715,7 +715,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
if
(
!
res_setup
->
classifs
)
if
(
!
res_setup
->
classifs
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
ff_dlog
(
NULL
,
" begin %
d end %d part.size %d classif.s %d classbook %d
\n
"
,
ff_dlog
(
NULL
,
" begin %
"
PRIu32
" end %"
PRIu32
" part.size %u classif.s %"
PRIu8
" classbook %"
PRIu8
"
\n
"
,
res_setup
->
begin
,
res_setup
->
end
,
res_setup
->
partition_size
,
res_setup
->
begin
,
res_setup
->
end
,
res_setup
->
partition_size
,
res_setup
->
classifications
,
res_setup
->
classbook
);
res_setup
->
classifications
,
res_setup
->
classbook
);
...
@@ -855,7 +855,7 @@ static int create_map(vorbis_context *vc, unsigned floor_number)
...
@@ -855,7 +855,7 @@ static int create_map(vorbis_context *vc, unsigned floor_number)
}
}
for
(
idx
=
0
;
idx
<=
n
;
++
idx
)
{
for
(
idx
=
0
;
idx
<=
n
;
++
idx
)
{
ff_dlog
(
NULL
,
"floor0 map: map at pos %d is %
d
\n
"
,
idx
,
map
[
idx
]);
ff_dlog
(
NULL
,
"floor0 map: map at pos %d is %
"
PRId32
"
\n
"
,
idx
,
map
[
idx
]);
}
}
return
0
;
return
0
;
...
@@ -988,7 +988,7 @@ static int vorbis_parse_id_hdr(vorbis_context *vc)
...
@@ -988,7 +988,7 @@ static int vorbis_parse_id_hdr(vorbis_context *vc)
ff_mdct_init
(
&
vc
->
mdct
[
0
],
bl0
,
1
,
-
1
.
0
);
ff_mdct_init
(
&
vc
->
mdct
[
0
],
bl0
,
1
,
-
1
.
0
);
ff_mdct_init
(
&
vc
->
mdct
[
1
],
bl1
,
1
,
-
1
.
0
);
ff_mdct_init
(
&
vc
->
mdct
[
1
],
bl1
,
1
,
-
1
.
0
);
ff_dlog
(
NULL
,
" vorbis version %
d
\n
audio_channels %d
\n
audio_samplerate %d
\n
bitrate_max %d
\n
bitrate_nom %d
\n
bitrate_min %d
\n
blk_0 %d blk_1 %d
\n
"
,
ff_dlog
(
NULL
,
" vorbis version %
"
PRIu32
"
\n
audio_channels %"
PRIu8
"
\n
audio_samplerate %"
PRIu32
"
\n
bitrate_max %"
PRIu32
"
\n
bitrate_nom %"
PRIu32
"
\n
bitrate_min %"
PRIu32
"
\n
blk_0 %"
PRIu32
" blk_1 %"
PRIu32
"
\n
"
,
vc
->
version
,
vc
->
audio_channels
,
vc
->
audio_samplerate
,
vc
->
bitrate_maximum
,
vc
->
bitrate_nominal
,
vc
->
bitrate_minimum
,
vc
->
blocksize
[
0
],
vc
->
blocksize
[
1
]);
vc
->
version
,
vc
->
audio_channels
,
vc
->
audio_samplerate
,
vc
->
bitrate_maximum
,
vc
->
bitrate_nominal
,
vc
->
bitrate_minimum
,
vc
->
blocksize
[
0
],
vc
->
blocksize
[
1
]);
/*
/*
...
...
libavcodec/wmaprodec.c
View file @
0b77a593
...
@@ -607,8 +607,8 @@ static int decode_tilehdr(WMAProDecodeCtx *s)
...
@@ -607,8 +607,8 @@ static int decode_tilehdr(WMAProDecodeCtx *s)
int
i
;
int
i
;
int
offset
=
0
;
int
offset
=
0
;
for
(
i
=
0
;
i
<
s
->
channel
[
c
].
num_subframes
;
i
++
)
{
for
(
i
=
0
;
i
<
s
->
channel
[
c
].
num_subframes
;
i
++
)
{
ff_dlog
(
s
->
avctx
,
"frame[%
i
] channel[%i] subframe[%i]"
ff_dlog
(
s
->
avctx
,
"frame[%
"
PRIi32
"
] channel[%i] subframe[%i]"
" len %
i
\n
"
,
s
->
frame_num
,
c
,
i
,
" len %
"
PRIu16
"
\n
"
,
s
->
frame_num
,
c
,
i
,
s
->
channel
[
c
].
subframe_len
[
i
]);
s
->
channel
[
c
].
subframe_len
[
i
]);
s
->
channel
[
c
].
subframe_offset
[
i
]
=
offset
;
s
->
channel
[
c
].
subframe_offset
[
i
]
=
offset
;
offset
+=
s
->
channel
[
c
].
subframe_len
[
i
];
offset
+=
s
->
channel
[
c
].
subframe_len
[
i
];
...
...
libavformat/mov.c
View file @
0b77a593
...
@@ -634,7 +634,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
...
@@ -634,7 +634,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
ctype
=
avio_rl32
(
pb
);
ctype
=
avio_rl32
(
pb
);
type
=
avio_rl32
(
pb
);
/* component subtype */
type
=
avio_rl32
(
pb
);
/* component subtype */
av_log
(
c
->
fc
,
AV_LOG_TRACE
,
"ctype= %.4s (0x%08
x)
\n
"
,
(
char
*
)
&
ctype
,
ctype
);
av_log
(
c
->
fc
,
AV_LOG_TRACE
,
"ctype= %.4s (0x%08
"
PRIx32
")
\n
"
,
(
char
*
)
&
ctype
,
ctype
);
av_log
(
c
->
fc
,
AV_LOG_TRACE
,
"stype= %.4s
\n
"
,
(
char
*
)
&
type
);
av_log
(
c
->
fc
,
AV_LOG_TRACE
,
"stype= %.4s
\n
"
,
(
char
*
)
&
type
);
if
(
type
==
MKTAG
(
'v'
,
'i'
,
'd'
,
'e'
))
if
(
type
==
MKTAG
(
'v'
,
'i'
,
'd'
,
'e'
))
...
...
libavformat/movenc.c
View file @
0b77a593
...
@@ -1377,7 +1377,7 @@ static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
...
@@ -1377,7 +1377,7 @@ static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
track
->
par
->
codec_tag
);
track
->
par
->
codec_tag
);
av_log
(
s
,
AV_LOG_WARNING
,
av_log
(
s
,
AV_LOG_WARNING
,
"Unknown hldr_type for %s / 0x%04
X
, writing dummy values
\n
"
,
"Unknown hldr_type for %s / 0x%04
"
PRIX32
"
, writing dummy values
\n
"
,
tag_buf
,
track
->
par
->
codec_tag
);
tag_buf
,
track
->
par
->
codec_tag
);
}
}
if
(
track
->
st
)
{
if
(
track
->
st
)
{
...
...
libavformat/mux.c
View file @
0b77a593
...
@@ -205,7 +205,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
...
@@ -205,7 +205,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
char
tagbuf
[
32
];
char
tagbuf
[
32
];
av_get_codec_tag_string
(
tagbuf
,
sizeof
(
tagbuf
),
par
->
codec_tag
);
av_get_codec_tag_string
(
tagbuf
,
sizeof
(
tagbuf
),
par
->
codec_tag
);
av_log
(
s
,
AV_LOG_ERROR
,
av_log
(
s
,
AV_LOG_ERROR
,
"Tag %s/0x%08
x
incompatible with output codec id '%d'
\n
"
,
"Tag %s/0x%08
"
PRIx32
"
incompatible with output codec id '%d'
\n
"
,
tagbuf
,
par
->
codec_tag
,
par
->
codec_id
);
tagbuf
,
par
->
codec_tag
,
par
->
codec_id
);
ret
=
AVERROR_INVALIDDATA
;
ret
=
AVERROR_INVALIDDATA
;
goto
fail
;
goto
fail
;
...
...
libavformat/omaenc.c
View file @
0b77a593
...
@@ -84,7 +84,7 @@ static av_cold int oma_write_header(AVFormatContext *s)
...
@@ -84,7 +84,7 @@ static av_cold int oma_write_header(AVFormatContext *s)
(
par
->
block_align
/
8
-
1
));
(
par
->
block_align
/
8
-
1
));
break
;
break
;
default:
default:
av_log
(
s
,
AV_LOG_ERROR
,
"OMA: unsupported codec tag %
d
for write
\n
"
,
av_log
(
s
,
AV_LOG_ERROR
,
"OMA: unsupported codec tag %
"
PRIu32
"
for write
\n
"
,
par
->
codec_tag
);
par
->
codec_tag
);
}
}
for
(
i
=
0
;
i
<
(
EA3_HEADER_SIZE
-
36
)
/
4
;
i
++
)
for
(
i
=
0
;
i
<
(
EA3_HEADER_SIZE
-
36
)
/
4
;
i
++
)
...
...
libavformat/rmdec.c
View file @
0b77a593
...
@@ -319,7 +319,7 @@ int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb,
...
@@ -319,7 +319,7 @@ int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb,
st
->
codecpar
->
codec_tag
=
avio_rl32
(
pb
);
st
->
codecpar
->
codec_tag
=
avio_rl32
(
pb
);
st
->
codecpar
->
codec_id
=
ff_codec_get_id
(
ff_rm_codec_tags
,
st
->
codecpar
->
codec_id
=
ff_codec_get_id
(
ff_rm_codec_tags
,
st
->
codecpar
->
codec_tag
);
st
->
codecpar
->
codec_tag
);
av_log
(
s
,
AV_LOG_TRACE
,
"%
X
%X
\n
"
,
st
->
codecpar
->
codec_tag
,
MKTAG
(
'R'
,
'V'
,
'2'
,
'0'
));
av_log
(
s
,
AV_LOG_TRACE
,
"%
"
PRIX32
"
%X
\n
"
,
st
->
codecpar
->
codec_tag
,
MKTAG
(
'R'
,
'V'
,
'2'
,
'0'
));
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_NONE
)
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_NONE
)
goto
fail1
;
goto
fail1
;
st
->
codecpar
->
width
=
avio_rb16
(
pb
);
st
->
codecpar
->
width
=
avio_rb16
(
pb
);
...
...
libavformat/rpl.c
View file @
0b77a593
...
@@ -171,7 +171,7 @@ static int rpl_read_header(AVFormatContext *s)
...
@@ -171,7 +171,7 @@ static int rpl_read_header(AVFormatContext *s)
break
;
break
;
default:
default:
av_log
(
s
,
AV_LOG_WARNING
,
av_log
(
s
,
AV_LOG_WARNING
,
"RPL video format %
i
not supported yet!
\n
"
,
"RPL video format %
"
PRIu32
"
not supported yet!
\n
"
,
vst
->
codecpar
->
codec_tag
);
vst
->
codecpar
->
codec_tag
);
vst
->
codecpar
->
codec_id
=
AV_CODEC_ID_NONE
;
vst
->
codecpar
->
codec_id
=
AV_CODEC_ID_NONE
;
}
}
...
@@ -236,7 +236,7 @@ static int rpl_read_header(AVFormatContext *s)
...
@@ -236,7 +236,7 @@ static int rpl_read_header(AVFormatContext *s)
rpl
->
frames_per_chunk
=
read_line_and_int
(
pb
,
&
error
);
// video frames per chunk
rpl
->
frames_per_chunk
=
read_line_and_int
(
pb
,
&
error
);
// video frames per chunk
if
(
rpl
->
frames_per_chunk
>
1
&&
vst
->
codecpar
->
codec_tag
!=
124
)
if
(
rpl
->
frames_per_chunk
>
1
&&
vst
->
codecpar
->
codec_tag
!=
124
)
av_log
(
s
,
AV_LOG_WARNING
,
av_log
(
s
,
AV_LOG_WARNING
,
"Don't know how to split frames for video format %
i
. "
"Don't know how to split frames for video format %
"
PRIu32
"
. "
"Video stream will be broken!
\n
"
,
vst
->
codecpar
->
codec_tag
);
"Video stream will be broken!
\n
"
,
vst
->
codecpar
->
codec_tag
);
number_of_chunks
=
read_line_and_int
(
pb
,
&
error
);
// number of chunks in the file
number_of_chunks
=
read_line_and_int
(
pb
,
&
error
);
// number of chunks in the file
...
...
libavformat/xwma.c
View file @
0b77a593
...
@@ -86,7 +86,7 @@ static int xwma_read_header(AVFormatContext *s)
...
@@ -86,7 +86,7 @@ static int xwma_read_header(AVFormatContext *s)
* anyway.
* anyway.
*/
*/
if
(
st
->
codecpar
->
codec_id
!=
AV_CODEC_ID_WMAV2
)
{
if
(
st
->
codecpar
->
codec_id
!=
AV_CODEC_ID_WMAV2
)
{
avpriv_request_sample
(
s
,
"Unexpected codec (tag 0x04%
x
; id %d)"
,
avpriv_request_sample
(
s
,
"Unexpected codec (tag 0x04%
"
PRIx32
"
; id %d)"
,
st
->
codecpar
->
codec_tag
,
st
->
codecpar
->
codec_id
);
st
->
codecpar
->
codec_tag
,
st
->
codecpar
->
codec_id
);
}
else
{
}
else
{
/* In all xWMA files I have seen, there is no extradata. But the WMA
/* In all xWMA files I have seen, there is no extradata. But the WMA
...
...
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