summaryrefslogtreecommitdiffstats
path: root/DOCS/tech
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-07-28 17:07:49 +0200
committerwm4 <wm4@mplayer2.org>2012-07-28 17:24:05 +0200
commit51e198c2a1e43b74ad35ef358628dcd8791158d9 (patch)
tree60f6c2255ed912a7a4866b71728104a2cb2442f1 /DOCS/tech
parent2793e7eb70a342b346788f83e1ed660c8e0d491e (diff)
parent7dfaaa95104a8e6dc024fddaf1b49c71768f1be7 (diff)
downloadmpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.bz2
mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.xz
Merge remote-tracking branch 'origin/master'
Conflicts: .gitignore bstr.c cfg-mplayer.h defaultopts.c libvo/video_out.c The conflict in bstr.c is due to uau adding a bstr_getline function in commit 2ba8b91a97e7e8. This function already existed in this branch. While uau's function is obviously derived from mine, it's incompatible. His function preserves line breaks, while mine strips them. Add a bstr_strip_linebreaks function, fix all other uses of bstr_getline, and pick uau's implementation. In .gitignore, change vo_gl3_shaders.h to use an absolute path additional to resolving the merge conflict.
Diffstat (limited to 'DOCS/tech')
-rw-r--r--DOCS/tech/codecs-in.html181
1 files changed, 0 insertions, 181 deletions
diff --git a/DOCS/tech/codecs-in.html b/DOCS/tech/codecs-in.html
deleted file mode 100644
index 488512d286..0000000000
--- a/DOCS/tech/codecs-in.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>Codec Status Table - MPlayer - The Movie Player</title>
- <link rel="stylesheet" type="text/css" href="default.css">
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<body text="#000000" link="#666666" vlink="#666666" alink="#666666">
-
-<h1>Status of codecs support</h1>
-
-<ul>
- <li><a href="#vc">Video codecs</a></li>
- <li><a href="#ac">Audio codecs</a></li>
-</ul>
-
-<table width=750 border="0">
- <tr>
- <td align="center">
- <b><font face="Verdana, Arial, Helvetica, sans-serif" size="5"><a name="vc">Video codecs:</a></font></b><br><br>
-
- <table width="100%" border="1" cellspacing="0" cellpadding="5">
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>Working video codecs</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td width=40 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">out</font></b></td>
- <td align=center colspan=2><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %0 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%F</b></td>
- <td align=center><b>%d</b></td>
- <td align=center><b>%Y</b></td>
- <td align=center colspan=2><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>New / Untested codecs</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %4 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%F</b></td>
- <td align=center><b>%d</b></td>
- <td align=center colspan=3><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>Codecs with problems</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %2 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%F</b></td>
- <td align=center><b>%d</b></td>
- <td align=center colspan=3><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>Not yet working codecs:</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %3 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%F</b></td>
- <td align=center><b>%d</b></td>
- <td align=center colspan=3><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- </table>
-
- <br><b><font face="Verdana, Arial, Helvetica, sans-serif" size="5"><a name="ac">Audio codecs:</a></font></b><br><br>
-
- <table width="100%" border="1" cellspacing="0" cellpadding="5">
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>Working audio codecs</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td align=center colspan=3><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %5 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%f</b></td>
- <td align=center><b>%d</b></td>
- <td align=center colspan=3><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>New / Untested codecs</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %9 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%f</b></td>
- <td align=center><b>%d</b></td>
- <td align=center colspan=3><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>Codecs with problems</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %7 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%f</b></td>
- <td align=center><b>%d</b></td>
- <td align=center colspan=3><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- <tr>
- <td colspan=6 bgcolor="#CCCCCC"><b>Not yet working codecs</b></td>
- </tr>
- <tr>
- <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td>
- <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td>
- <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td>
- <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td>
- </tr>
-<!-- %8 -->
- <tr>
- <td align=center><b>%i</b></td>
- <td align=center><b>%f</b></td>
- <td align=center><b>%d</b></td>
- <td align=center colspan=3><b>%c</b></td>
- </tr>
-<!-- %. -->
-
- </table>
- </td>
- </tr>
-</table>
-</body>
-</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 16:11:01 +0000