diff options
author | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-06 11:23:02 +0000 |
---|---|---|
committer | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-06 11:23:02 +0000 |
commit | 735de602321d160b12ea2edd70a89cc105f33017 (patch) | |
tree | 862d68c69b45b7123979ed2bb5038391a537655c /mencoder.c | |
parent | 3605b121ab30aeffd320c09b15d9b37573debffb (diff) | |
download | mpv-735de602321d160b12ea2edd70a89cc105f33017.tar.bz2 mpv-735de602321d160b12ea2edd70a89cc105f33017.tar.xz |
Adding -format and -af switches
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7615 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r-- | mencoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index d82e590bef..3f37e5a100 100644 --- a/mencoder.c +++ b/mencoder.c @@ -130,6 +130,7 @@ static float force_ofps=0; // set to 24 for inverse telecine static int skip_limit=-1; static int force_srate=0; +static int audio_output_format=0; char *vobsub_out=NULL; unsigned int vobsub_out_index=0; @@ -671,7 +672,7 @@ case ACODEC_COPY: } else { mux_a->wf = malloc(sizeof(WAVEFORMATEX)); mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize; - mux_a->wf->wFormatTag = sh_audio->format; + mux_a->wf->wFormatTag = audio_output_format?audio_output_format:sh_audio->format; mux_a->wf->nChannels = sh_audio->channels; mux_a->wf->nSamplesPerSec = sh_audio->samplerate; mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec; |