RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

Merge svn change r31134

Browse Source 
Fix some search/replace errors introduced in the svn commit.
This commit is contained in:
Uoti Urpala 2010-05-07 22:02:47 +03:00
commit 4c6e3ac01b
14 changed files with 3631 additions and 3641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfg-common-opts.h
View File

@ -232,12 +232,8 @@
{"vop", "-vop has been removed, use -vf instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL},
OPT_SETTINGSLIST("vf*", vf_settings, 0, &vf_obj_list),
// select audio/video codec (by name) or codec family (by number):
// {"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 22, NULL}, // keep ranges in sync
// {"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 29, NULL}, // with codec-cfg.c
// {"afm", &audio_fm, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
{"vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
// {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"ac", &audio_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
{"vc", &video_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},

13
codec-cfg.c
View File

@ -156,10 +156,10 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int
return 1;
}
static const struct {
static const struct {
const char *name;
const unsigned int num;
} fmt_table[] = {
} fmt_table[] = {
// note: due to parser deficiencies/simplicity, if one format
// name matches the beginning of another, the longer one _must_
// come first in this list.
@ -224,7 +224,7 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int
{"VDPAU_MPEG4",IMGFMT_VDPAU_MPEG4},
{NULL, 0}
};
};
static int add_to_inout(char *sfmt, char *sflags, unsigned int *outfmt,
@ -718,8 +718,7 @@ int parse_codec_cfg(const char *cfgfile)
goto err_out_parse_error;
if (!strcmp(token[0], "seekable"))
codec->flags |= CODECS_FLAG_SEEKABLE;
else
if (!strcmp(token[0], "align16"))
else if (!strcmp(token[0], "align16"))
codec->flags |= CODECS_FLAG_ALIGN16;
else
goto err_out_parse_error;
@ -913,13 +912,10 @@ void list_codecs(int audioflag){
mp_msg(MSGT_CODECCFG,MSGL_INFO,"%-11s %-9s %s %s [%s]\n",c->name,c->drv,s,c->info,c->dll);
else
mp_msg(MSGT_CODECCFG,MSGL_INFO,"%-11s %-9s %s %s\n",c->name,c->drv,s,c->info);
}
}
#ifdef CODECS2HTML
void wrapline(FILE *f2,char *s){
int c;
@ -978,7 +974,6 @@ void parsehtml(FILE *f1,FILE *f2,codecs_t *codec,int section,int dshow){
fputc(d,f2);
}
}
}
void skiphtml(FILE *f1){

29
cpudetect.c
View File

@ -108,7 +108,6 @@ do_cpuid(unsigned int ax, unsigned int *p)
"=c" (p[2]), "=d" (p[3])
: "0" (ax));
#endif
}
void GetCpuCaps( CpuCaps *caps)
@ -191,7 +190,7 @@ void GetCpuCaps( CpuCaps *caps)
gCpuCaps.hasSSE,
gCpuCaps.hasSSE2,
gCpuCaps.has3DNow,
gCpuCaps.has3DNowExt );
gCpuCaps.has3DNowExt);
#endif
/* FIXME: Does SSE2 need more OS support, too? */
@ -292,10 +291,10 @@ LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep)
#endif /* defined(__MINGW32__) || defined(__CYGWIN__) */
#ifdef __OS2__
ULONG _System os2_sig_handler_sse( PEXCEPTIONREPORTRECORD p1,
ULONG _System os2_sig_handler_sse(PEXCEPTIONREPORTRECORD p1,
PEXCEPTIONREGISTRATIONRECORD p2,
PCONTEXTRECORD p3,
PVOID p4 )
PVOID p4)
{
if(p1->ExceptionNum == XCPT_ILLEGAL_INSTRUCTION){
mp_msg(MSGT_CPUDETECT, MSGL_V, "SIGILL, ");
@ -512,37 +511,37 @@ void GetCpuCaps( CpuCaps *caps)
mp_msg(MSGT_CPUDETECT,MSGL_V,"AltiVec %sfound\n", (caps->hasAltiVec ? "" : "not "));
#endif /* HAVE_ALTIVEC */
if (ARCH_IA64)
if (ARCH_IA64)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: Intel Itanium\n");
if (ARCH_SPARC)
if (ARCH_SPARC)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: Sun Sparc\n");
if (ARCH_ARM)
if (ARCH_ARM)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: ARM\n");
if (ARCH_PPC)
if (ARCH_PPC)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: PowerPC\n");
if (ARCH_ALPHA)
if (ARCH_ALPHA)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: Digital Alpha\n");
if (ARCH_MIPS)
if (ARCH_MIPS)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: MIPS\n");
if (ARCH_PA_RISC)
if (ARCH_PA_RISC)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: Hewlett-Packard PA-RISC\n");
if (ARCH_S390)
if (ARCH_S390)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: IBM S/390\n");
if (ARCH_S390X)
if (ARCH_S390X)
mp_msg(MSGT_CPUDETECT,MSGL_V,"CPU: IBM S/390X\n");
if (ARCH_VAX)
if (ARCH_VAX)
mp_msg(MSGT_CPUDETECT,MSGL_V, "CPU: Digital VAX\n" );
if (ARCH_XTENSA)
if (ARCH_XTENSA)
mp_msg(MSGT_CPUDETECT,MSGL_V, "CPU: Tensilica Xtensa\n" );
}
#endif /* !ARCH_X86 */