diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
tree | 639c536e818c6ace974aa285ba94576df0353b01 /Documentation/video4linux/API.html | |
parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
download | linux-stable-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.tar.gz linux-stable-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.tar.bz2 linux-stable-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.zip |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'Documentation/video4linux/API.html')
-rw-r--r-- | Documentation/video4linux/API.html | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/Documentation/video4linux/API.html b/Documentation/video4linux/API.html index afbe9ae7ee96..d749d41f647b 100644 --- a/Documentation/video4linux/API.html +++ b/Documentation/video4linux/API.html @@ -1,16 +1,27 @@ -<TITLE>V4L API</TITLE> -<H1>Video For Linux APIs</H1> -<table border=0> -<tr> -<td> -<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L1_API.html> -V4L original API</a> -</td><td> -Obsoleted by V4L2 API -</td></tr><tr><td> -<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API> -V4L2 API</a> -</td><td> -Should be used for new projects -</td></tr> -</table> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> + <meta content="text/html;charset=ISO-8859-2" http-equiv="Content-Type" /> + <title>V4L API</title> + </head> + <body> + <h1>Video For Linux APIs</h1> + <table border="0"> + <tr> + <td> + <a href="http://www.linuxtv.org/downloads/video4linux/API/V4L1_API.html">V4L original API</a> + </td> + <td> + Obsoleted by V4L2 API + </td> + </tr> + <tr> + <td> + <a href="http://www.linuxtv.org/downloads/video4linux/API/V4L2_API">V4L2 API</a> + </td> + <td>Should be used for new projects + </td> + </tr> + </table> + </body> +</html> |