RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 07:42:17 +00:00
Code Issues Releases Wiki Activity

Fixed vfwex section, null codec and other fourcc issues and improved codecs-in.html usability.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1945 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2001-09-23 20:40:16 +00:00
parent 5a593d2193
commit b1b1744d55
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DOCS/codecs-in.html
View File

@ -5,12 +5,19 @@
<BODY BGCOLOR=#FFFFFF text="#000000" link="#666666" vlink="#666666" alink="#666666" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> <BODY BGCOLOR=#FFFFFF text="#000000" link="#666666" vlink="#666666" alink="#666666" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
<table width=750 border="0"> <table width=750 border="0">
<tr> <tr>
<td align=right> <td align="right">
<p>&nbsp;</p> <p>&nbsp;</p>
<p><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3">Status of codecs support</font></b></p> <p><b><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Status of codecs support</font></b></p>
</td>
<br><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Video codecs:</font><br> </tr>
<td>
<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><a href="#vc">Video codecs</a><br><a href="#ac">Audio codecs</a><br></font></p>
</td>
</tr>
<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" bordercolor=#DDDDDD> <table width="100%" border="1" cellspacing="0" cellpadding="5" bordercolor=#DDDDDD>
@ -112,7 +119,7 @@
</table> </table>
<br><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Audio codecs:</font><br> <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" bordercolor=#DDDDDD> <table width="100%" border="1" cellspacing="0" cellpadding="5" bordercolor=#DDDDDD>

11
codec-cfg.c
View File

@ -680,8 +680,8 @@ void parsehtml(FILE *f1,FILE *f2,codecs_t *codec,int section,int dshow){
fprintf(f2,"%c",codec->driver==dshow?'+':'-'); break; fprintf(f2,"%c",codec->driver==dshow?'+':'-'); break;
case 'F': case 'F':
for(d=0;d<CODECS_MAX_FOURCC;d++) for(d=0;d<CODECS_MAX_FOURCC;d++)
if(codec->fourcc[d]!=0xFFFFFFFF) if(!d || codec->fourcc[d]!=0xFFFFFFFF)
fprintf(f2,"%s%.4s",d?"<br>":"",codec->fourcc[d]<0x20202020?"-":(char*) &codec->fourcc[d]); fprintf(f2,"%s%.4s",d?"<br>":"",(codec->fourcc[d]==0xFFFFFFFF || codec->fourcc[d]<0x20202020)?!d?"-":"":(char*) &codec->fourcc[d]);
break; break;
case 'f': case 'f':
for(d=0;d<CODECS_MAX_FOURCC;d++) for(d=0;d<CODECS_MAX_FOURCC;d++)
@ -727,6 +727,7 @@ int main(void)
int nr_codecs; int nr_codecs;
int win32=-1; int win32=-1;
int dshow=-1; int dshow=-1;
int win32ex=-1;
if (!(codecs = parse_codec_cfg("etc/codecs.conf"))) if (!(codecs = parse_codec_cfg("etc/codecs.conf")))
return 0; return 0;
@ -757,7 +758,7 @@ int main(void)
// video // video
cl = codecs[0]; cl = codecs[0];
nr_codecs = nr_vcodecs; nr_codecs = nr_vcodecs;
dshow=4;win32=2; dshow=4;win32=2;win32ex=6;
} }
pos=ftell(f1); pos=ftell(f1);
for(i=0;i<nr_codecs;i++){ for(i=0;i<nr_codecs;i++){
@ -766,13 +767,13 @@ int main(void)
case 0: case 0:
case 5: case 5:
if(cl[i].status==CODECS_STATUS_WORKING) if(cl[i].status==CODECS_STATUS_WORKING)
if(!(cl[i].driver==win32 || cl[i].driver==dshow)) if(!(cl[i].driver==win32 || cl[i].driver==dshow || cl[i].driver==win32ex))
parsehtml(f1,f2,&cl[i],section,dshow); parsehtml(f1,f2,&cl[i],section,dshow);
break; break;
case 1: case 1:
case 6: case 6:
if(cl[i].status==CODECS_STATUS_WORKING) if(cl[i].status==CODECS_STATUS_WORKING)
if(cl[i].driver==win32 || cl[i].driver==dshow) if(cl[i].driver==win32 || cl[i].driver==dshow || cl[i].driver==win32ex)
parsehtml(f1,f2,&cl[i],section,dshow); parsehtml(f1,f2,&cl[i],section,dshow);
break; break;
case 2: case 2: