Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
144ef773
Commit
144ef773
authored
Mar 09, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use correct msvc type specifiers for ptrdiff_t and size_t.
parent
953b8c5a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
alsdec.c
libavcodec/alsdec.c
+2
-2
g2meet.c
libavcodec/g2meet.c
+1
-1
hq_hqa.c
libavcodec/hq_hqa.c
+2
-2
http.c
libavformat/http.c
+1
-1
mov.c
libavformat/mov.c
+2
-2
mpjpegdec.c
libavformat/mpjpegdec.c
+1
-1
No files found.
libavcodec/alsdec.c
View file @
144ef773
...
@@ -1292,13 +1292,13 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd,
...
@@ -1292,13 +1292,13 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd,
if
(
ch
[
dep
].
time_diff_sign
)
{
if
(
ch
[
dep
].
time_diff_sign
)
{
t
=
-
t
;
t
=
-
t
;
if
(
begin
<
t
)
{
if
(
begin
<
t
)
{
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
"begin %
td
smaller than time diff index %d.
\n
"
,
begin
,
t
);
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
"begin %
"
PTRDIFF_SPECIFIER
"
smaller than time diff index %d.
\n
"
,
begin
,
t
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
begin
-=
t
;
begin
-=
t
;
}
else
{
}
else
{
if
(
end
<
t
)
{
if
(
end
<
t
)
{
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
"end %
td
smaller than time diff index %d.
\n
"
,
end
,
t
);
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
"end %
"
PTRDIFF_SPECIFIER
"
smaller than time diff index %d.
\n
"
,
end
,
t
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
end
-=
t
;
end
-=
t
;
...
...
libavcodec/g2meet.c
View file @
144ef773
...
@@ -900,7 +900,7 @@ static int epic_jb_decode_tile(G2MContext *c, int tile_x, int tile_y,
...
@@ -900,7 +900,7 @@ static int epic_jb_decode_tile(G2MContext *c, int tile_x, int tile_y,
}
}
if
(
src_size
<
els_dsize
)
{
if
(
src_size
<
els_dsize
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"ePIC: data too short, needed %
zu, got %zu
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"ePIC: data too short, needed %
"
SIZE_SPECIFIER
", got %"
SIZE_SPECIFIER
"
\n
"
,
els_dsize
,
src_size
);
els_dsize
,
src_size
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
...
libavcodec/hq_hqa.c
View file @
144ef773
...
@@ -154,7 +154,7 @@ static int hq_decode_frame(HQContext *ctx, AVFrame *pic,
...
@@ -154,7 +154,7 @@ static int hq_decode_frame(HQContext *ctx, AVFrame *pic,
slice_off
[
slice
]
>=
slice_off
[
slice
+
1
]
||
slice_off
[
slice
]
>=
slice_off
[
slice
+
1
]
||
slice_off
[
slice
+
1
]
>
data_size
)
{
slice_off
[
slice
+
1
]
>
data_size
)
{
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
"Invalid slice size %
zu
.
\n
"
,
data_size
);
"Invalid slice size %
"
SIZE_SPECIFIER
"
.
\n
"
,
data_size
);
break
;
break
;
}
}
init_get_bits
(
&
gb
,
src
+
slice_off
[
slice
],
init_get_bits
(
&
gb
,
src
+
slice_off
[
slice
],
...
@@ -277,7 +277,7 @@ static int hqa_decode_frame(HQContext *ctx, AVFrame *pic, size_t data_size)
...
@@ -277,7 +277,7 @@ static int hqa_decode_frame(HQContext *ctx, AVFrame *pic, size_t data_size)
slice_off
[
slice
]
>=
slice_off
[
slice
+
1
]
||
slice_off
[
slice
]
>=
slice_off
[
slice
+
1
]
||
slice_off
[
slice
+
1
]
>
data_size
)
{
slice_off
[
slice
+
1
]
>
data_size
)
{
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
"Invalid slice size %
zu
.
\n
"
,
data_size
);
"Invalid slice size %
"
SIZE_SPECIFIER
"
.
\n
"
,
data_size
);
break
;
break
;
}
}
init_get_bits
(
&
gb
,
src
+
slice_off
[
slice
],
init_get_bits
(
&
gb
,
src
+
slice_off
[
slice
],
...
...
libavformat/http.c
View file @
144ef773
...
@@ -370,7 +370,7 @@ static int http_write_reply(URLContext* h, int status_code)
...
@@ -370,7 +370,7 @@ static int http_write_reply(URLContext* h, int status_code)
message_len
=
snprintf
(
message
,
sizeof
(
message
),
message_len
=
snprintf
(
message
,
sizeof
(
message
),
"HTTP/1.1 %03d %s
\r\n
"
"HTTP/1.1 %03d %s
\r\n
"
"Content-Type: %s
\r\n
"
"Content-Type: %s
\r\n
"
"Content-Length: %
zu
\r\n
"
"Content-Length: %
"
SIZE_SPECIFIER
"
\r\n
"
"
\r\n
"
"
\r\n
"
"%03d %s
\r\n
"
,
"%03d %s
\r\n
"
,
reply_code
,
reply_code
,
...
...
libavformat/mov.c
View file @
144ef773
...
@@ -4209,7 +4209,7 @@ static int mov_seek_auxiliary_info(AVFormatContext *s, MOVStreamContext *sc)
...
@@ -4209,7 +4209,7 @@ static int mov_seek_auxiliary_info(AVFormatContext *s, MOVStreamContext *sc)
auxiliary_info_seek_offset
=
sc
->
cenc
.
auxiliary_info_default_size
*
sc
->
current_sample
;
auxiliary_info_seek_offset
=
sc
->
cenc
.
auxiliary_info_default_size
*
sc
->
current_sample
;
}
else
if
(
sc
->
cenc
.
auxiliary_info_sizes
)
{
}
else
if
(
sc
->
cenc
.
auxiliary_info_sizes
)
{
if
(
sc
->
current_sample
>
sc
->
cenc
.
auxiliary_info_sizes_count
)
{
if
(
sc
->
current_sample
>
sc
->
cenc
.
auxiliary_info_sizes_count
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"current sample %d greater than the number of auxiliary info sample sizes %
zu
\n
"
,
av_log
(
s
,
AV_LOG_ERROR
,
"current sample %d greater than the number of auxiliary info sample sizes %
"
SIZE_SPECIFIER
"
\n
"
,
sc
->
current_sample
,
sc
->
cenc
.
auxiliary_info_sizes_count
);
sc
->
current_sample
,
sc
->
cenc
.
auxiliary_info_sizes_count
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
@@ -4220,7 +4220,7 @@ static int mov_seek_auxiliary_info(AVFormatContext *s, MOVStreamContext *sc)
...
@@ -4220,7 +4220,7 @@ static int mov_seek_auxiliary_info(AVFormatContext *s, MOVStreamContext *sc)
}
}
if
(
auxiliary_info_seek_offset
>
sc
->
cenc
.
auxiliary_info_end
-
sc
->
cenc
.
auxiliary_info
)
{
if
(
auxiliary_info_seek_offset
>
sc
->
cenc
.
auxiliary_info_end
-
sc
->
cenc
.
auxiliary_info
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"auxiliary info offset %
zu greater than auxiliary info size %zu
\n
"
,
av_log
(
s
,
AV_LOG_ERROR
,
"auxiliary info offset %
"
SIZE_SPECIFIER
" greater than auxiliary info size %"
SIZE_SPECIFIER
"
\n
"
,
auxiliary_info_seek_offset
,
(
size_t
)(
sc
->
cenc
.
auxiliary_info_end
-
sc
->
cenc
.
auxiliary_info
));
auxiliary_info_seek_offset
,
(
size_t
)(
sc
->
cenc
.
auxiliary_info_end
-
sc
->
cenc
.
auxiliary_info
));
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
...
libavformat/mpjpegdec.c
View file @
144ef773
...
@@ -201,7 +201,7 @@ static int parse_multipart_header(AVIOContext *pb,
...
@@ -201,7 +201,7 @@ static int parse_multipart_header(AVIOContext *pb,
if
(
log_ctx
)
if
(
log_ctx
)
av_log
(
log_ctx
,
av_log
(
log_ctx
,
AV_LOG_ERROR
,
AV_LOG_ERROR
,
"Expected boundary '%s' not found, instead found a line of %
zu
bytes
\n
"
,
"Expected boundary '%s' not found, instead found a line of %
"
SIZE_SPECIFIER
"
bytes
\n
"
,
expected_boundary
,
expected_boundary
,
strlen
(
line
));
strlen
(
line
));
...
...
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