diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-03 23:01:17 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-03 23:01:17 +0000 |
| commit | 88f3691ded6e2111aa94009ad9af86f116002c84 (patch) | |
| tree | bdbf0a9c79d57bc310340b511927cc1893187f4b /mencoder.c | |
| parent | b01ec90b2869f9bb89916f371129b6ca5ebf59db (diff) | |
| download | mpv-88f3691ded6e2111aa94009ad9af86f116002c84.tar.bz2 mpv-88f3691ded6e2111aa94009ad9af86f116002c84.tar.xz | |
-oac/-ovc (fake:))
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2662 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mencoder.c b/mencoder.c index 2bc0006670..f9e0a023ed 100644 --- a/mencoder.c +++ b/mencoder.c @@ -50,6 +50,9 @@ char *video_codec=NULL; // override video codec int audio_family=-1; // override audio codec family int video_family=-1; // override video codec family +int out_audio_codec=ACODEC_VBRMP3; +int out_video_codec=VCODEC_DIVX4; + // audio stream skip/resync functions requires only for seeking. // (they should be implemented in the audio codec layer) //void skip_audio_frame(sh_audio_t *sh_audio){} @@ -83,8 +86,8 @@ static char* passtmpfile="divx2pass.log"; static int play_n_frames=-1; -char *out_audio_codec=NULL; // override audio codec -char *out_video_codec=NULL; // override video codec +//char *out_audio_codec=NULL; // override audio codec +//char *out_video_codec=NULL; // override video codec //#include "libmpeg2/mpeg2.h" //#include "libmpeg2/mpeg2_internal.h" @@ -419,7 +422,7 @@ mux_v->h.dwSampleSize=0; // VBR mux_v->h.dwScale=10000; mux_v->h.dwRate=mux_v->h.dwScale*(force_ofps?force_ofps:sh_video->fps); -mux_v->codec=VCODEC_DIVX4; // 0=streamcopy +mux_v->codec=out_video_codec; switch(mux_v->codec){ case 0: @@ -447,8 +450,7 @@ mux_a->buffer=malloc(mux_a->buffer_size); mux_a->source=sh_audio; -//mux_a->codec=ACODEC_PCM; // 0=streamcopy -mux_a->codec=ACODEC_VBRMP3; // 0=streamcopy +mux_a->codec=out_audio_codec; switch(mux_a->codec){ case 0: |