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

diff --git a/modules/access/v4l2/controls.c b/modules/access/v4l2/controls.c
index f88e16f8b9a0636ca9cb915593ba2f840671781d..1a6f5bb1600da492f29ea915e6c5a91e3124a4d7 100644 (file)
--- a/modules/access/v4l2/controls.c
+++ b/modules/access/v4l2/controls.c
@@ -51,7 +51,6 @@ static const vlc_v4l2_ctrl_name_t controls[] =
     { "audio-treble", V4L2_CID_AUDIO_TREBLE },
     { "audio-mute", V4L2_CID_AUDIO_MUTE },
     { "audio-loudness", V4L2_CID_AUDIO_LOUDNESS },
-    { "black-level", V4L2_CID_BLACK_LEVEL },
     { "auto-white-balance", V4L2_CID_AUTO_WHITE_BALANCE },
     { "do-white-balance", V4L2_CID_DO_WHITE_BALANCE },
     { "red-balance", V4L2_CID_RED_BALANCE },

diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 6dc724cbd5697b6b3d7e3124485f7cad856bec11..3483986cd902e21fb82d2819a838b7d63942db30 100644 (file)
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -103,9 +103,6 @@
 #define HUE_TEXT N_( "Hue" )
 #define HUE_LONGTEXT N_( \
     "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_LONGTEXT N_( \
     "Automatically set the white balance of the video input " \
@@ -334,8 +331,7 @@ vlc_module_begin ()
                  SATURATION_LONGTEXT, true )
     add_integer( CFG_PREFIX "hue", -1, HUE_TEXT,
                  HUE_LONGTEXT, true )
-    add_integer( CFG_PREFIX "black-level", -1, BLACKLEVEL_TEXT,
-                 BLACKLEVEL_LONGTEXT, true )
+    add_obsolete_integer( CFG_PREFIX "black-level" ) /* since Linux 2.6.26 */
     add_integer( CFG_PREFIX "auto-white-balance", -1,
                  AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true )
         change_integer_list( tristate_vlc, tristate_user )