Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
f4218d93
Commit
f4218d93
authored
Apr 23, 2017
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_maskedmerge: fix bug when copying >8bit plane(s)
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
710c97d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
maskedmerge.h
libavfilter/maskedmerge.h
+1
-0
vf_maskedmerge.c
libavfilter/vf_maskedmerge.c
+4
-1
No files found.
libavfilter/maskedmerge.h
View file @
f4218d93
...
...
@@ -27,6 +27,7 @@
typedef
struct
MaskedMergeContext
{
const
AVClass
*
class
;
int
width
[
4
],
height
[
4
];
int
linesize
[
4
];
int
nb_planes
;
int
planes
;
int
half
,
depth
;
...
...
libavfilter/vf_maskedmerge.c
View file @
f4218d93
...
...
@@ -91,7 +91,7 @@ static int process_frame(FFFrameSync *fs)
for
(
p
=
0
;
p
<
s
->
nb_planes
;
p
++
)
{
if
(
!
((
1
<<
p
)
&
s
->
planes
))
{
av_image_copy_plane
(
out
->
data
[
p
],
out
->
linesize
[
p
],
base
->
data
[
p
],
base
->
linesize
[
p
],
s
->
width
[
p
],
s
->
height
[
p
]);
s
->
linesize
[
p
],
s
->
height
[
p
]);
continue
;
}
...
...
@@ -229,6 +229,9 @@ static int config_output(AVFilterLink *outlink)
outlink
->
sample_aspect_ratio
=
base
->
sample_aspect_ratio
;
outlink
->
frame_rate
=
base
->
frame_rate
;
if
((
ret
=
av_image_fill_linesizes
(
s
->
linesize
,
outlink
->
format
,
outlink
->
w
))
<
0
)
return
ret
;
if
((
ret
=
ff_framesync_init
(
&
s
->
fs
,
ctx
,
3
))
<
0
)
return
ret
;
...
...
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