diff --git a/[refs] b/[refs] index bd9fb80aa5d5..fd30dfea53f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f67a03ff6ada162ad7518d9092f72d830d3a887 +refs/heads/master: 1b1301e67bbcad0649a8b3c6a944d2b2acddc411 diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml index 466fe27d3ffe..74b87f6e480a 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml @@ -118,7 +118,7 @@ this command, drivers and applications must set this field to zero. - __u32 + __s32 speed Playback speed and direction. The playback speed is defined as speed/1000 of the normal speed. So 1000 is normal playback.