Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
4a160042
Commit
4a160042
authored
Sep 03, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a typo in YUVP blending to RGB.
parent
3cbe2bd0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
modules/video_filter/blend.c
modules/video_filter/blend.c
+7
-4
No files found.
modules/video_filter/blend.c
View file @
4a160042
...
...
@@ -1247,7 +1247,6 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
int
i_src1_pitch
,
i_src2_pitch
,
i_dst_pitch
;
uint8_t
*
p_src1
,
*
p_src2
,
*
p_dst
;
int
i_x
,
i_y
,
i_pix_pitch
,
i_trans
;
int
r
,
g
,
b
;
video_palette_t
rgbpalette
;
int
i_rindex
,
i_gindex
,
i_bindex
;
...
...
@@ -1272,8 +1271,12 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
/* Convert palette first */
for
(
i_y
=
0
;
i_y
<
p_filter
->
fmt_in
.
video
.
p_palette
->
i_entries
&&
i_y
<
256
;
i_y
++
)
{
int
r
,
g
,
b
;
yuv_to_rgb
(
&
r
,
&
g
,
&
b
,
p_pal
[
i_y
][
0
],
p_pal
[
i_y
][
1
],
p_pal
[
i_y
][
2
]
);
rgbpal
[
i_y
][
0
]
=
r
;
rgbpal
[
i_y
][
1
]
=
g
;
rgbpal
[
i_y
][
2
]
=
b
;
rgbpal
[
i_y
][
0
]
=
r
;
rgbpal
[
i_y
][
1
]
=
g
;
rgbpal
[
i_y
][
2
]
=
b
;
}
/* */
...
...
@@ -1295,13 +1298,13 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
if
(
p_filter
->
fmt_out
.
video
.
i_chroma
==
FCC_RV15
||
p_filter
->
fmt_out
.
video
.
i_chroma
==
FCC_RV16
)
vlc_blend_rgb16
(
(
uint16_t
*
)
&
p_dst
[
i_x
*
i_pix_pitch
],
(
const
uint16_t
*
)
&
p_src1
[
i_x
*
i_pix_pitch
],
rgbpal
[
p_src2
[
i_x
]][
0
],
rgbpal
[
p_src2
[
i_x
]][
1
],
rgbpal
[
p_src2
[
i_x
]][
3
],
rgbpal
[
p_src2
[
i_x
]][
0
],
rgbpal
[
p_src2
[
i_x
]][
1
],
rgbpal
[
p_src2
[
i_x
]][
2
],
i_trans
,
&
p_filter
->
fmt_out
.
video
);
else
vlc_blend_packed
(
&
p_dst
[
i_x
*
i_pix_pitch
],
&
p_src1
[
i_x
*
i_pix_pitch
],
i_rindex
,
i_gindex
,
i_bindex
,
rgbpal
[
p_src2
[
i_x
]][
0
],
rgbpal
[
p_src2
[
i_x
]][
1
],
rgbpal
[
p_src2
[
i_x
]][
3
],
rgbpal
[
p_src2
[
i_x
]][
0
],
rgbpal
[
p_src2
[
i_x
]][
1
],
rgbpal
[
p_src2
[
i_x
]][
2
],
i_trans
,
true
);
}
}
...
...
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