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
8b1ab358
Commit
8b1ab358
authored
Mar 13, 2010
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opengl: make sure we use this module instead of the caca vout as default within the legacy VLC.app
parent
c68b8101
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
modules/video_output/opengl.c
modules/video_output/opengl.c
+4
-4
No files found.
modules/video_output/opengl.c
View file @
8b1ab358
...
@@ -63,7 +63,7 @@ vlc_module_begin ()
...
@@ -63,7 +63,7 @@ vlc_module_begin ()
set_subcategory
(
SUBCAT_VIDEO_VOUT
)
set_subcategory
(
SUBCAT_VIDEO_VOUT
)
set_description
(
N_
(
"OpenGL video output"
)
)
set_description
(
N_
(
"OpenGL video output"
)
)
#ifdef __APPLE__
#ifdef __APPLE__
set_capability
(
"video output"
,
2
00
)
set_capability
(
"video output"
,
4
00
)
#else
#else
set_capability
(
"video output"
,
20
)
set_capability
(
"video output"
,
20
)
#endif
#endif
...
@@ -339,7 +339,7 @@ static int Manage( vout_thread_t *p_vout )
...
@@ -339,7 +339,7 @@ static int Manage( vout_thread_t *p_vout )
if
(
p_sys
->
p_vout
->
i_alignment
!=
p_vout
->
i_alignment
)
if
(
p_sys
->
p_vout
->
i_alignment
!=
p_vout
->
i_alignment
)
{
{
p_vout
->
i_changes
|=
VOUT_CROP_CHANGE
;
//to force change
p_vout
->
i_changes
|=
VOUT_CROP_CHANGE
;
//to force change
p_sys
->
p_vout
->
i_alignment
=
p_vout
->
i_alignment
;
p_sys
->
p_vout
->
i_alignment
=
p_vout
->
i_alignment
;
}
}
/* forward signal that autoscale toggle has changed */
/* forward signal that autoscale toggle has changed */
...
@@ -377,7 +377,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -377,7 +377,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
p_next
=
picture_pool_Get
(
p_sys
->
p_pool
);
p_next
=
picture_pool_Get
(
p_sys
->
p_pool
);
assert
(
p_next
);
assert
(
p_next
);
}
}
if
(
p_sys
->
p_current
)
if
(
p_sys
->
p_current
)
{
{
assert
(
p_sys
->
p_current
->
p
[
0
].
p_pixels
==
p_pic
->
p
[
0
].
p_pixels
);
assert
(
p_sys
->
p_current
->
p
[
0
].
p_pixels
==
p_pic
->
p
[
0
].
p_pixels
);
...
@@ -394,7 +394,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -394,7 +394,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
if
(
p_sys
->
p_current
!=
p_next
)
{
if
(
p_sys
->
p_current
!=
p_next
)
{
if
(
p_sys
->
p_current
)
if
(
p_sys
->
p_current
)
picture_Release
(
p_sys
->
p_current
);
picture_Release
(
p_sys
->
p_current
);
/* Swap the picture texture on opengl vout side. */
/* Swap the picture texture on opengl vout side. */
p_sys
->
p_current
=
p_next
;
p_sys
->
p_current
=
p_next
;
...
...
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