Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 270221
b: refs/heads/master
c: 88b6fc8
h: refs/heads/master
i:
  270219: 0b67ad3
v: v3
  • Loading branch information
Marc Zyngier committed Oct 23, 2011
1 parent 1cdac99 commit d4d735a
Show file tree
Hide file tree
Showing 590 changed files with 3,613 additions and 7,959 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cefd3e71efca6f4ef7f06f1fc507771d76072741
refs/heads/master: 88b6fc8c57055590d8e9538f6faa85483db8c366
38 changes: 19 additions & 19 deletions trunk/Documentation/DocBook/media/v4l/controls.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ Applicable to the H264 encoder.</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-h264-vui-sar-idc">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_h264_vui_sar_idc</entry>
</row>
Expand Down Expand Up @@ -1561,7 +1561,7 @@ Applicable to the H264 encoder.</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-h264-level">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_h264_level</entry>
</row>
Expand Down Expand Up @@ -1641,7 +1641,7 @@ Possible values are:</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-mpeg4-level">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_level</entry>
</row>
Expand Down Expand Up @@ -1689,9 +1689,9 @@ Possible values are:</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-h264-profile">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_h264_profile</entry>
<entry>enum&nbsp;v4l2_mpeg_h264_profile</entry>
</row>
<row><entry spanname="descr">The profile information for H264.
Applicable to the H264 encoder.
Expand Down Expand Up @@ -1774,9 +1774,9 @@ Possible values are:</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-mpeg4-profile">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_profile</entry>
<entry>enum&nbsp;v4l2_mpeg_mpeg4_profile</entry>
</row>
<row><entry spanname="descr">The profile information for MPEG4.
Applicable to the MPEG4 encoder.
Expand Down Expand Up @@ -1820,9 +1820,9 @@ Applicable to the encoder.
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-multi-slice-mode">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_multi_slice_mode</entry>
<entry>enum&nbsp;v4l2_mpeg_multi_slice_mode</entry>
</row>
<row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.
Applicable to the encoder.
Expand Down Expand Up @@ -1868,9 +1868,9 @@ Applicable to the encoder.</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-h264-loop-filter-mode">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_h264_loop_filter_mode</entry>
<entry>enum&nbsp;v4l2_mpeg_h264_loop_filter_mode</entry>
</row>
<row><entry spanname="descr">Loop filter mode for H264 encoder.
Possible values are:</entry>
Expand Down Expand Up @@ -1913,9 +1913,9 @@ Applicable to the H264 encoder.</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-h264-entropy-mode">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_h264_entropy_mode</entry>
<entry>enum&nbsp;v4l2_mpeg_h264_symbol_mode</entry>
</row>
<row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.
Applicable to the H264 encoder.
Expand Down Expand Up @@ -2140,9 +2140,9 @@ previous frames. Applicable to the H264 encoder.</entry>
</row>

<row><entry></entry></row>
<row id="v4l2-mpeg-video-header-mode">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_video_header_mode</entry>
<entry>enum&nbsp;v4l2_mpeg_header_mode</entry>
</row>
<row><entry spanname="descr">Determines whether the header is returned as the first buffer or is
it returned together with the first frame. Applicable to encoders.
Expand Down Expand Up @@ -2320,9 +2320,9 @@ Valid only when H.264 and macroblock level RC is enabled (<constant>V4L2_CID_MPE
Applicable to the H264 encoder.</entry>
</row>
<row><entry></entry></row>
<row id="v4l2-mpeg-mfc51-video-frame-skip-mode">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_mfc51_video_frame_skip_mode</entry>
<entry>enum&nbsp;v4l2_mpeg_mfc51_frame_skip_mode</entry>
</row>
<row><entry spanname="descr">
Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
Expand Down Expand Up @@ -2361,9 +2361,9 @@ the stream will meet tight bandwidth contraints. Applicable to encoders.
</entry>
</row>
<row><entry></entry></row>
<row id="v4l2-mpeg-mfc51-video-force-frame-type">
<row>
<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant>&nbsp;</entry>
<entry>enum&nbsp;v4l2_mpeg_mfc51_video_force_frame_type</entry>
<entry>enum&nbsp;v4l2_mpeg_mfc51_force_frame_type</entry>
</row>
<row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.
Possible values are:</entry>
Expand Down
2 changes: 0 additions & 2 deletions trunk/Documentation/ioctl/ioctl-number.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,4 @@ Code Seq#(hex) Include File Comments
<mailto:thomas@winischhofer.net>
0xF4 00-1F video/mbxfb.h mbxfb
<mailto:raph@8d.com>
0xF6 all LTTng Linux Trace Toolkit Next Generation
<mailto:mathieu.desnoyers@efficios.com>
0xFD all linux/dm-ioctl.h
2 changes: 1 addition & 1 deletion trunk/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 1
SUBLEVEL = 0
EXTRAVERSION = -rc6
EXTRAVERSION = -rc5
NAME = "Divemaster Edition"

# *DOCUMENTATION*
Expand Down
Loading

0 comments on commit d4d735a

Please sign in to comment.