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
726e253b
Commit
726e253b
authored
Jul 04, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/img2dec: allocate and clear padding area for probe correctly
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
7d179b12
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
img2dec.c
libavformat/img2dec.c
+14
-4
No files found.
libavformat/img2dec.c
View file @
726e253b
...
...
@@ -304,12 +304,21 @@ int ff_img_read_header(AVFormatContext *s1)
s
->
split_planes
=
str
&&
!
av_strcasecmp
(
str
+
1
,
"y"
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
if
(
s1
->
pb
)
{
uint8_t
probe_buffer
[
AVPROBE_PADDING_SIZE
]
=
{
0
};
int
probe_buffer_size
=
8
;
uint8_t
*
probe_buffer
=
av_realloc
(
NULL
,
probe_buffer_size
+
AVPROBE_PADDING_SIZE
);
AVInputFormat
*
fmt
=
NULL
;
AVProbeData
pd
;
int
ret
=
avio_read
(
s1
->
pb
,
probe_buffer
,
8
);
if
(
ret
<
8
)
return
AVERROR
(
EINVAL
);
int
ret
;
if
(
!
probe_buffer
)
return
AVERROR
(
ENOMEM
);
probe_buffer_size
=
avio_read
(
s1
->
pb
,
probe_buffer
,
probe_buffer_size
);
if
(
probe_buffer_size
<
0
)
{
av_free
(
probe_buffer
);
return
probe_buffer_size
;
}
memset
(
probe_buffer
+
probe_buffer_size
,
0
,
AVPROBE_PADDING_SIZE
);
avio_seek
(
s1
->
pb
,
-
8
,
SEEK_CUR
);
pd
.
buf
=
probe_buffer
;
...
...
@@ -327,6 +336,7 @@ int ff_img_read_header(AVFormatContext *s1)
break
;
}
}
av_free
(
probe_buffer
);
}
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_NONE
)
st
->
codec
->
codec_id
=
ff_guess_image2_codec
(
s
->
path
);
...
...
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