diff options
| author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-07 09:53:47 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-07 09:53:47 +0000 |
| commit | 2465ba5a84f83f095f1e8706a146e04babe60e1f (patch) | |
| tree | d3c46c67b03fc302f090f1fe8ce27350df41d82a /cfg-mplayer.h | |
| parent | 52430859d457c2441d45a9db669efb7e451ff47f (diff) | |
| download | mpv-2465ba5a84f83f095f1e8706a146e04babe60e1f.tar.bz2 mpv-2465ba5a84f83f095f1e8706a146e04babe60e1f.tar.xz | |
Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1287 b3059339-0415-0410-9bf9-f77b7e298cf2
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", |