diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /Documentation/video4linux/Zoran | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'Documentation/video4linux/Zoran')
| -rw-r--r-- | Documentation/video4linux/Zoran | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran index 295462b2317a..0e89e7676298 100644 --- a/Documentation/video4linux/Zoran +++ b/Documentation/video4linux/Zoran | |||
| @@ -401,8 +401,7 @@ Additional notes for software developers: | |||
| 401 | first set the correct norm. Well, it seems logically correct: TV | 401 | first set the correct norm. Well, it seems logically correct: TV |
| 402 | standard is "more constant" for current country than geometry | 402 | standard is "more constant" for current country than geometry |
| 403 | settings of a variety of TV capture cards which may work in ITU or | 403 | settings of a variety of TV capture cards which may work in ITU or |
| 404 | square pixel format. Remember that users now can lock the norm to | 404 | square pixel format. |
| 405 | avoid any ambiguity. | ||
| 406 | -- | 405 | -- |
| 407 | Please note that lavplay/lavrec are also included in the MJPEG-tools | 406 | Please note that lavplay/lavrec are also included in the MJPEG-tools |
| 408 | (http://mjpeg.sf.net/). | 407 | (http://mjpeg.sf.net/). |