Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
6bf818a2
Commit
6bf818a2
authored
Feb 11, 2007
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #675.
parent
8d46123c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
modules/video_filter/logo.c
modules/video_filter/logo.c
+5
-7
No files found.
modules/video_filter/logo.c
View file @
6bf818a2
...
@@ -450,6 +450,10 @@ static int Init( vout_thread_t *p_vout )
...
@@ -450,6 +450,10 @@ static int Init( vout_thread_t *p_vout )
p_sys
->
posx
=
p_vout
->
render
.
i_width
/
2
-
p_sys
->
i_width
/
2
;
p_sys
->
posx
=
p_vout
->
render
.
i_width
/
2
-
p_sys
->
i_width
/
2
;
}
}
}
}
else
{
p_sys
->
pos
=
0
;
}
/* Try to open the real video output */
/* Try to open the real video output */
msg_Dbg
(
p_vout
,
"spawning the real video output"
);
msg_Dbg
(
p_vout
,
"spawning the real video output"
);
...
@@ -554,12 +558,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
...
@@ -554,12 +558,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
p_sys
->
p_blend
->
fmt_in
.
video
.
i_visible_height
=
p_sys
->
p_blend
->
fmt_in
.
video
.
i_visible_height
=
p_pic
->
p
[
Y_PLANE
].
i_visible_lines
;
p_pic
->
p
[
Y_PLANE
].
i_visible_lines
;
/* Just in case the new image would overflow the vout */
if
(
p_sys
->
pos
)
if
(
(
unsigned
int
)(
p_sys
->
posy
+
p_sys
->
i_height
)
>
p_vout
->
render
.
i_height
||
(
unsigned
int
)(
p_sys
->
posx
+
p_sys
->
i_width
)
>
p_vout
->
render
.
i_width
||
p_sys
->
pos
)
{
{
if
(
p_sys
->
pos
&
SUBPICTURE_ALIGN_BOTTOM
)
if
(
p_sys
->
pos
&
SUBPICTURE_ALIGN_BOTTOM
)
{
{
...
@@ -569,7 +568,6 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
...
@@ -569,7 +568,6 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
{
{
p_sys
->
posy
=
p_vout
->
render
.
i_height
/
2
-
p_sys
->
i_height
/
2
;
p_sys
->
posy
=
p_vout
->
render
.
i_height
/
2
-
p_sys
->
i_height
/
2
;
}
}
if
(
p_sys
->
pos
&
SUBPICTURE_ALIGN_RIGHT
)
if
(
p_sys
->
pos
&
SUBPICTURE_ALIGN_RIGHT
)
{
{
p_sys
->
posx
=
p_vout
->
render
.
i_width
-
p_sys
->
i_width
;
p_sys
->
posx
=
p_vout
->
render
.
i_width
-
p_sys
->
i_width
;
...
...
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