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
c4e29d0b
Commit
c4e29d0b
authored
Feb 03, 2020
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_xfade_opencl: move passthrough code before eof check
parent
6d5e9ed6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
vf_xfade_opencl.c
libavfilter/vf_xfade_opencl.c
+3
-3
No files found.
libavfilter/vf_xfade_opencl.c
View file @
c4e29d0b
...
@@ -270,6 +270,9 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
...
@@ -270,6 +270,9 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
ret
=
ff_inlink_consume_frame
(
avctx
->
inputs
[
1
],
&
in
);
ret
=
ff_inlink_consume_frame
(
avctx
->
inputs
[
1
],
&
in
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
return
ret
;
return
ret
;
}
else
if
(
ret
>
0
)
{
in
->
pts
=
(
in
->
pts
-
ctx
->
last_pts
)
+
ctx
->
pts
;
return
ff_filter_frame
(
outlink
,
in
);
}
else
if
(
ff_inlink_acknowledge_status
(
avctx
->
inputs
[
1
],
&
status
,
&
pts
))
{
}
else
if
(
ff_inlink_acknowledge_status
(
avctx
->
inputs
[
1
],
&
status
,
&
pts
))
{
ff_outlink_set_status
(
outlink
,
status
,
ctx
->
pts
);
ff_outlink_set_status
(
outlink
,
status
,
ctx
->
pts
);
return
0
;
return
0
;
...
@@ -278,9 +281,6 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
...
@@ -278,9 +281,6 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
ff_inlink_request_frame
(
avctx
->
inputs
[
1
]);
ff_inlink_request_frame
(
avctx
->
inputs
[
1
]);
return
0
;
return
0
;
}
}
}
else
{
in
->
pts
=
(
in
->
pts
-
ctx
->
last_pts
)
+
ctx
->
pts
;
return
ff_filter_frame
(
outlink
,
in
);
}
}
}
}
...
...
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