From 967944e2ac27b45ad05b8f005c994396038045ae Mon Sep 17 00:00:00 2001 From: Tomasz Stanislawski Date: Wed, 29 Jun 2011 07:16:15 -0300 Subject: [PATCH] --- yaml --- r: 261559 b: refs/heads/master c: 5930ab2ba089e05c8de594c36836724f8df7725e h: refs/heads/master i: 261557: b3cdab60ec085905f2e70331faaf07e02769d2cd 261555: 1a53e1bb44ec35a5e278802ba75f6a65cfb176cd 261551: 0b195d946511443976782ee5ec26e52f639f75e1 v: v3 --- [refs] | 2 +- trunk/include/media/v4l2-subdev.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9cb5207d99cd..c39c7966f225 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b32dd0d3f9221719507700fa396d280143b4da1 +refs/heads/master: 5930ab2ba089e05c8de594c36836724f8df7725e diff --git a/trunk/include/media/v4l2-subdev.h b/trunk/include/media/v4l2-subdev.h index 3bc7f928c61a..9ff0ab9069d7 100644 --- a/trunk/include/media/v4l2-subdev.h +++ b/trunk/include/media/v4l2-subdev.h @@ -229,6 +229,9 @@ struct v4l2_subdev_audio_ops { s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by video input devices. + g_std_output: get current standard for video OUTPUT devices. This is ignored + by video input devices. + g_tvnorms_output: get v4l2_std_id with all standards supported by video OUTPUT device. This is ignored by video input devices. @@ -269,6 +272,7 @@ struct v4l2_subdev_video_ops { int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config); int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags); int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std); + int (*g_std_output)(struct v4l2_subdev *sd, v4l2_std_id *std); int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std); int (*g_tvnorms_output)(struct v4l2_subdev *sd, v4l2_std_id *std); int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);