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
24cb1f97
Commit
24cb1f97
authored
Nov 29, 2012
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/vf_tile: forward errors.
parent
3b316247
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
vf_tile.c
libavfilter/vf_tile.c
+7
-7
No files found.
libavfilter/vf_tile.c
View file @
24cb1f97
...
...
@@ -149,17 +149,19 @@ static void draw_blank_frame(AVFilterContext *ctx, AVFilterBufferRef *out_buf)
x0
,
y0
,
inlink
->
w
,
inlink
->
h
);
tile
->
current
++
;
}
static
void
end_last_frame
(
AVFilterContext
*
ctx
)
static
int
end_last_frame
(
AVFilterContext
*
ctx
)
{
TileContext
*
tile
=
ctx
->
priv
;
AVFilterLink
*
outlink
=
ctx
->
outputs
[
0
];
AVFilterBufferRef
*
out_buf
=
outlink
->
out_buf
;
int
ret
;
outlink
->
out_buf
=
NULL
;
while
(
tile
->
current
<
tile
->
nb_frames
)
draw_blank_frame
(
ctx
,
out_buf
);
ff_filter_frame
(
outlink
,
out_buf
);
ret
=
ff_filter_frame
(
outlink
,
out_buf
);
tile
->
current
=
0
;
return
ret
;
}
/* Note: direct rendering is not possible since there is no guarantee that
...
...
@@ -198,7 +200,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
avfilter_unref_bufferp
(
&
inlink
->
cur_buf
);
if
(
++
tile
->
current
==
tile
->
nb_frames
)
end_last_frame
(
ctx
);
return
end_last_frame
(
ctx
);
return
0
;
}
...
...
@@ -214,15 +216,13 @@ static int request_frame(AVFilterLink *outlink)
r
=
ff_request_frame
(
inlink
);
if
(
r
<
0
)
{
if
(
r
==
AVERROR_EOF
&&
tile
->
current
)
end_last_frame
(
ctx
);
else
return
r
;
r
=
end_last_frame
(
ctx
);
break
;
}
if
(
!
tile
->
current
)
/* done */
break
;
}
return
0
;
return
r
;
}
static
const
AVFilterPad
tile_inputs
[]
=
{
...
...
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