Skip to content

V
vlc
Commit 1de4dba3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

V4L2: mark black-level obsolete (also kernel 2.6.26)

parent 4da99e58
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
modules/access/v4l2/controls.c
View file @ 1de4dba3
...@@ -51,7 +51,6 @@ static const vlc_v4l2_ctrl_name_t controls[] = ...@@ -51,7 +51,6 @@ static const vlc_v4l2_ctrl_name_t controls[] =
{ "audio-treble", V4L2_CID_AUDIO_TREBLE }, { "audio-treble", V4L2_CID_AUDIO_TREBLE },
{ "audio-mute", V4L2_CID_AUDIO_MUTE }, { "audio-mute", V4L2_CID_AUDIO_MUTE },
{ "audio-loudness", V4L2_CID_AUDIO_LOUDNESS }, { "audio-loudness", V4L2_CID_AUDIO_LOUDNESS },
{ "black-level", V4L2_CID_BLACK_LEVEL },
{ "auto-white-balance", V4L2_CID_AUTO_WHITE_BALANCE }, { "auto-white-balance", V4L2_CID_AUTO_WHITE_BALANCE },
{ "do-white-balance", V4L2_CID_DO_WHITE_BALANCE }, { "do-white-balance", V4L2_CID_DO_WHITE_BALANCE },
{ "red-balance", V4L2_CID_RED_BALANCE }, { "red-balance", V4L2_CID_RED_BALANCE },
......
modules/access/v4l2/video.c
View file @ 1de4dba3
...@@ -103,9 +103,6 @@ ...@@ -103,9 +103,6 @@
#define HUE_TEXT N_( "Hue" ) #define HUE_TEXT N_( "Hue" )
#define HUE_LONGTEXT N_( \ #define HUE_LONGTEXT N_( \
"Hue of the video input (if supported by the v4l2 driver)." ) "Hue of the video input (if supported by the v4l2 driver)." )
#define BLACKLEVEL_TEXT N_( "Black level" )
#define BLACKLEVEL_LONGTEXT N_( \
"Black level of the video input (if supported by the v4l2 driver)." )
#define AUTOWHITEBALANCE_TEXT N_( "Auto white balance" ) #define AUTOWHITEBALANCE_TEXT N_( "Auto white balance" )
#define AUTOWHITEBALANCE_LONGTEXT N_( \ #define AUTOWHITEBALANCE_LONGTEXT N_( \
"Automatically set the white balance of the video input " \ "Automatically set the white balance of the video input " \
...@@ -334,8 +331,7 @@ vlc_module_begin () ...@@ -334,8 +331,7 @@ vlc_module_begin ()
SATURATION_LONGTEXT, true ) SATURATION_LONGTEXT, true )
add_integer( CFG_PREFIX "hue", -1, HUE_TEXT, add_integer( CFG_PREFIX "hue", -1, HUE_TEXT,
HUE_LONGTEXT, true ) HUE_LONGTEXT, true )
add_integer( CFG_PREFIX "black-level", -1, BLACKLEVEL_TEXT, add_obsolete_integer( CFG_PREFIX "black-level" ) /* since Linux 2.6.26 */
BLACKLEVEL_LONGTEXT, true )
add_integer( CFG_PREFIX "auto-white-balance", -1, add_integer( CFG_PREFIX "auto-white-balance", -1,
AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true ) AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true )
change_integer_list( tristate_vlc, tristate_user ) change_integer_list( tristate_vlc, tristate_user )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment