Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / Documentation / media / uapi / dvb / video-set-format.rst

diff --git a/Documentation/media/uapi/dvb/video-set-format.rst b/Documentation/media/uapi/dvb/video-set-format.rst
index 53d66ec..4239a4e 100644 (file)
--- a/Documentation/media/uapi/dvb/video-set-format.rst
+++ b/Documentation/media/uapi/dvb/video-set-format.rst
@@ -11,11 +11,13 @@ Name
 
 VIDEO_SET_FORMAT
 
 
 VIDEO_SET_FORMAT
 

+.. attention:: This ioctl is deprecated.

 
 Synopsis
 --------
 
 
 Synopsis
 --------
 

-.. cpp:function:: int ioctl(fd, int request = VIDEO_SET_FORMAT, video_format_t format)
+.. c:function:: int ioctl(fd, VIDEO_SET_FORMAT, video_format_t format)
+    :name: VIDEO_SET_FORMAT

 
 
 Arguments
 
 
 Arguments


@@ -52,6 +54,15 @@ This ioctl sets the screen format (aspect ratio) of the connected output
 device (TV) so that the output of the decoder can be adjusted
 accordingly.
 
 device (TV) so that the output of the decoder can be adjusted
 accordingly.
 

+.. c:type:: video_format_t
+
+.. code-block:: c
+
+       typedef enum {
+               VIDEO_FORMAT_4_3,     /* Select 4:3 format */
+               VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
+               VIDEO_FORMAT_221_1    /* 2.21:1 */
+       } video_format_t;

 
 Return Value
 ------------
 
 Return Value
 ------------