diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /Documentation/video4linux/Zoran | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/video4linux/Zoran')
| -rw-r--r-- | Documentation/video4linux/Zoran | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran index 0e89e7676298..00e3f9267814 100644 --- a/Documentation/video4linux/Zoran +++ b/Documentation/video4linux/Zoran | |||
| @@ -174,7 +174,7 @@ and is used in Argentinia, Uruguay, an a few others | |||
| 174 | We do not talk about how the audio is broadcast ! | 174 | We do not talk about how the audio is broadcast ! |
| 175 | 175 | ||
| 176 | A rather good sites about the TV standards are: | 176 | A rather good sites about the TV standards are: |
| 177 | http://www.sony.jp/ServiceArea/Voltage_map/ | 177 | http://www.sony.jp/support/ |
| 178 | http://info.electronicwerkstatt.de/bereiche/fernsehtechnik/frequenzen_und_normen/Fernsehnormen/ | 178 | http://info.electronicwerkstatt.de/bereiche/fernsehtechnik/frequenzen_und_normen/Fernsehnormen/ |
| 179 | and http://www.cabl.com/restaurant/channel.html | 179 | and http://www.cabl.com/restaurant/channel.html |
| 180 | 180 | ||
| @@ -330,7 +330,7 @@ These extensions are known as the v4l/mjpeg extensions. See zoran.h for | |||
| 330 | details (structs/ioctls). | 330 | details (structs/ioctls). |
| 331 | 331 | ||
| 332 | Information - video4linux: | 332 | Information - video4linux: |
| 333 | http://roadrunner.swansea.linux.org.uk/v4lapi.shtml | 333 | http://linux.bytesex.org/v4l2/API.html |
| 334 | Documentation/video4linux/API.html | 334 | Documentation/video4linux/API.html |
| 335 | /usr/include/linux/videodev.h | 335 | /usr/include/linux/videodev.h |
| 336 | 336 | ||
| @@ -390,7 +390,7 @@ BUZIOC_G_STATUS | |||
| 390 | Get the status of the input lines (video source connected/norm). | 390 | Get the status of the input lines (video source connected/norm). |
| 391 | 391 | ||
| 392 | For programming example, please, look at lavrec.c and lavplay.c code in | 392 | For programming example, please, look at lavrec.c and lavplay.c code in |
| 393 | lavtools-1.2p2 package (URL: http://www.cicese.mx/~mirsev/DC10plus/) | 393 | lavtools-1.2p2 package (URL: http://www.cicese.mx/) |
| 394 | and the 'examples' directory in the original Buz driver distribution. | 394 | and the 'examples' directory in the original Buz driver distribution. |
| 395 | 395 | ||
| 396 | Additional notes for software developers: | 396 | Additional notes for software developers: |