Mercurial > mplayer.hg
changeset 7529:c276bfb414fb
removed obsolete/unused audio|video_fm|codec, has_audio|video
| author | arpi |
|---|---|
| date | Sat, 28 Sep 2002 18:45:47 +0000 |
| parents | 1129b3cff6e1 |
| children | e4be3ed4b3cc |
| files | cfg-common.h mencoder.c mplayer.c mplayer.h |
| diffstat | 4 files changed, 8 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sat Sep 28 18:42:17 2002 +0000 +++ b/cfg-common.h Sat Sep 28 18:45:47 2002 +0000 @@ -100,8 +100,8 @@ #endif // disable audio - {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"sound", &audio_id, CONF_TYPE_FLAG, 0, -2, -1, NULL}, + {"nosound", &audio_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, // 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
--- a/mencoder.c Sat Sep 28 18:42:17 2002 +0000 +++ b/mencoder.c Sat Sep 28 18:45:47 2002 +0000 @@ -91,12 +91,9 @@ char* dvdsub_lang=NULL; static char* spudec_ifo=NULL; -static int has_audio=1; -char *audio_codec=NULL; // override audio codec -char *video_codec=NULL; // override video codec -char **audio_codec_list=NULL; // override video codec -char **video_codec_list=NULL; // override video codec -char** audio_fm_list=NULL; // override video codec family +char** audio_codec_list=NULL; // override audio codec +char** video_codec_list=NULL; // override video codec +char** audio_fm_list=NULL; // override audio codec family char** video_fm_list=NULL; // override video codec family int out_audio_codec=-1; @@ -451,7 +448,7 @@ if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0); - if(!has_audio || demuxer2) audio_id=-2; /* do NOT read audio packets... */ + if(demuxer2) audio_id=-2; /* do NOT read audio packets... */ //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id); demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
--- a/mplayer.c Sat Sep 28 18:42:17 2002 +0000 +++ b/mplayer.c Sat Sep 28 18:45:47 2002 +0000 @@ -174,13 +174,9 @@ int abs_seek_pos=0; // codecs: -int has_audio=1; -int has_video=1; -char *audio_codec=NULL; // override audio codec -char *video_codec=NULL; // override video codec -char **audio_codec_list=NULL; // override video codec +char **audio_codec_list=NULL; // override audio codec char **video_codec_list=NULL; // override video codec -char **audio_fm_list=NULL; // override video codec family +char **audio_fm_list=NULL; // override audio codec family char **video_fm_list=NULL; // override video codec family // streaming: @@ -1058,8 +1054,6 @@ //============ Open DEMUXERS --- DETECT file type ======================= -if(!has_audio) audio_id=-2; // do NOT read audio packets... - current_module="demux_open"; demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);