diff options
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 2f8d82d55b..cd22456ca7 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -40,8 +40,6 @@ extern int ao_pcm_waveheader; extern char *mDisplayName; #endif -extern int force_vcodec; - struct config conf[]={ /* name, pointer, type, flags, min, max */ {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ @@ -57,7 +55,6 @@ struct config conf[]={ {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0}, #endif {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 }, - {"vcodec", &force_vcodec, CONF_TYPE_INT, CONF_RANGE, 1, 5 }, #ifdef HAVE_LIBCSS {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0}, {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0}, @@ -137,8 +134,10 @@ struct config conf[]={ {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10}, {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0}, {"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000+1}, - {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6}, - {"dshow", &allow_dshow, CONF_TYPE_FLAG, 0, 0, 1}, + {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6}, // This might be removed later - atmos :: + {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0}, + {"vc", &video_codec, CONF_TYPE_STRING, 0, 0, 0}, + {"dshow", &allow_dshow, CONF_TYPE_FLAG, 0, 0, 1}, // Is this still needed? atmos :: {"nodshow", &allow_dshow, CONF_TYPE_FLAG, 0, 1, 0}, {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99}, {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", |