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
b43d1314
Commit
b43d1314
authored
Oct 28, 2017
by
dxfhgwet
Committed by
Paul B Mahol
Oct 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/zscale: fix segfault on library error
parent
4205e20c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
vf_zscale.c
libavfilter/vf_zscale.c
+3
-3
No files found.
libavfilter/vf_zscale.c
View file @
b43d1314
...
@@ -321,7 +321,7 @@ static int print_zimg_error(AVFilterContext *ctx)
...
@@ -321,7 +321,7 @@ static int print_zimg_error(AVFilterContext *ctx)
av_log
(
ctx
,
AV_LOG_ERROR
,
"code %d: %s
\n
"
,
err_code
,
err_msg
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"code %d: %s
\n
"
,
err_code
,
err_msg
);
return
err_code
;
return
AVERROR_EXTERNAL
;
}
}
static
int
convert_chroma_location
(
enum
AVChromaLocation
chroma_location
)
static
int
convert_chroma_location
(
enum
AVChromaLocation
chroma_location
)
...
@@ -624,7 +624,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
...
@@ -624,7 +624,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
ret
=
zimg_filter_graph_process
(
s
->
graph
,
&
src_buf
,
&
dst_buf
,
s
->
tmp
,
0
,
0
,
0
,
0
);
ret
=
zimg_filter_graph_process
(
s
->
graph
,
&
src_buf
,
&
dst_buf
,
s
->
tmp
,
0
,
0
,
0
,
0
);
if
(
ret
)
{
if
(
ret
)
{
print_zimg_error
(
link
->
dst
);
ret
=
print_zimg_error
(
link
->
dst
);
goto
fail
;
goto
fail
;
}
}
...
@@ -639,7 +639,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
...
@@ -639,7 +639,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
ret
=
zimg_filter_graph_process
(
s
->
alpha_graph
,
&
src_buf
,
&
dst_buf
,
s
->
tmp
,
0
,
0
,
0
,
0
);
ret
=
zimg_filter_graph_process
(
s
->
alpha_graph
,
&
src_buf
,
&
dst_buf
,
s
->
tmp
,
0
,
0
,
0
,
0
);
if
(
ret
)
{
if
(
ret
)
{
print_zimg_error
(
link
->
dst
);
ret
=
print_zimg_error
(
link
->
dst
);
goto
fail
;
goto
fail
;
}
}
}
else
if
(
odesc
->
flags
&
AV_PIX_FMT_FLAG_ALPHA
)
{
}
else
if
(
odesc
->
flags
&
AV_PIX_FMT_FLAG_ALPHA
)
{
...
...
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