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
4da99e58
Commit
4da99e58
authored
Oct 01, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
V4L2: mark horizontal and vertical center controls obsolete
They were deprecated in Linux version 2.6.26.
parent
47b90623
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
12 deletions
+2
-12
modules/access/v4l2/controls.c
modules/access/v4l2/controls.c
+0
-2
modules/access/v4l2/video.c
modules/access/v4l2/video.c
+2
-10
No files found.
modules/access/v4l2/controls.c
View file @
4da99e58
...
@@ -62,8 +62,6 @@ static const vlc_v4l2_ctrl_name_t controls[] =
...
@@ -62,8 +62,6 @@ static const vlc_v4l2_ctrl_name_t controls[] =
{
"gain"
,
V4L2_CID_GAIN
},
{
"gain"
,
V4L2_CID_GAIN
},
{
"hflip"
,
V4L2_CID_HFLIP
},
{
"hflip"
,
V4L2_CID_HFLIP
},
{
"vflip"
,
V4L2_CID_VFLIP
},
{
"vflip"
,
V4L2_CID_VFLIP
},
{
"hcenter"
,
V4L2_CID_HCENTER
},
{
"vcenter"
,
V4L2_CID_VCENTER
},
/* TODO: add more standardized controls */
/* TODO: add more standardized controls */
#define CTRL_CID_KNOWN(cid) \
#define CTRL_CID_KNOWN(cid) \
((((uint32_t)cid) - V4L2_CID_BRIGHTNESS) \
((((uint32_t)cid) - V4L2_CID_BRIGHTNESS) \
...
...
modules/access/v4l2/video.c
View file @
4da99e58
...
@@ -139,12 +139,6 @@
...
@@ -139,12 +139,6 @@
#define VFLIP_TEXT N_( "Vertical flip" )
#define VFLIP_TEXT N_( "Vertical flip" )
#define VFLIP_LONGTEXT N_( \
#define VFLIP_LONGTEXT N_( \
"Flip the video vertically (if supported by the v4l2 driver)." )
"Flip the video vertically (if supported by the v4l2 driver)." )
#define HCENTER_TEXT N_( "Horizontal centering" )
#define HCENTER_LONGTEXT N_( \
"Set the camera's horizontal centering (if supported by the v4l2 driver)." )
#define VCENTER_TEXT N_( "Vertical centering" )
#define VCENTER_LONGTEXT N_( \
"Set the camera's vertical centering (if supported by the v4l2 driver)." )
#define AUDIO_VOLUME_TEXT N_( "Volume" )
#define AUDIO_VOLUME_TEXT N_( "Volume" )
#define AUDIO_VOLUME_LONGTEXT N_( \
#define AUDIO_VOLUME_LONGTEXT N_( \
...
@@ -362,10 +356,8 @@ vlc_module_begin ()
...
@@ -362,10 +356,8 @@ vlc_module_begin ()
GAIN_LONGTEXT
,
true
)
GAIN_LONGTEXT
,
true
)
add_bool
(
CFG_PREFIX
"hflip"
,
false
,
HFLIP_TEXT
,
HFLIP_LONGTEXT
,
true
)
add_bool
(
CFG_PREFIX
"hflip"
,
false
,
HFLIP_TEXT
,
HFLIP_LONGTEXT
,
true
)
add_bool
(
CFG_PREFIX
"vflip"
,
false
,
VFLIP_TEXT
,
VFLIP_LONGTEXT
,
true
)
add_bool
(
CFG_PREFIX
"vflip"
,
false
,
VFLIP_TEXT
,
VFLIP_LONGTEXT
,
true
)
add_integer
(
CFG_PREFIX
"hcenter"
,
-
1
,
HCENTER_TEXT
,
add_obsolete_integer
(
CFG_PREFIX
"hcenter"
)
/* since Linux 2.6.26 */
HCENTER_LONGTEXT
,
true
)
add_obsolete_integer
(
CFG_PREFIX
"vcenter"
)
/* since Linux 2.6.26 */
add_integer
(
CFG_PREFIX
"vcenter"
,
-
1
,
VCENTER_TEXT
,
VCENTER_LONGTEXT
,
true
)
add_integer
(
CFG_PREFIX
"audio-volume"
,
-
1
,
AUDIO_VOLUME_TEXT
,
add_integer
(
CFG_PREFIX
"audio-volume"
,
-
1
,
AUDIO_VOLUME_TEXT
,
AUDIO_VOLUME_LONGTEXT
,
true
)
AUDIO_VOLUME_LONGTEXT
,
true
)
add_integer
(
CFG_PREFIX
"audio-balance"
,
-
1
,
AUDIO_BALANCE_TEXT
,
add_integer
(
CFG_PREFIX
"audio-balance"
,
-
1
,
AUDIO_BALANCE_TEXT
,
...
...
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