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},

7
codec-cfg.c
View File

@ -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){

1
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)