diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-28 02:23:20 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-28 02:23:20 +0000 |
| commit | dbf0fe78c631aa786c54afe7fbb1ee63c359a0b0 (patch) | |
| tree | c0a5c20701f23da143ef9b0d12ec2b78b49c5dc0 /mencoder.c | |
| parent | 7f62a29ed9126ba3d55f45476f42510ca98beed7 (diff) | |
| download | mpv-dbf0fe78c631aa786c54afe7fbb1ee63c359a0b0.tar.bz2 mpv-dbf0fe78c631aa786c54afe7fbb1ee63c359a0b0.tar.xz | |
-ac/-afm rewrite, now works the same way as -vc/-vfm
including audio codec fallbacks if init failed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7523 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index cdf9735767..fe7181ffdc 100644 --- a/mencoder.c +++ b/mencoder.c @@ -94,9 +94,11 @@ 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=NULL; // override audio codec family char* video_fm=NULL; // override video codec family +char** audio_fm_list=NULL; // override video codec family char** video_fm_list=NULL; // override video codec family int out_audio_codec=-1; @@ -488,7 +490,7 @@ sh_video=d_video->sh; if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf)){ // Go through the codec.conf and find the best codec... mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); - if(!init_best_audio_codec(sh_audio,audio_codec,audio_fm)){ + if(!init_best_audio_codec(sh_audio,audio_codec_list,audio_fm_list)){ sh_audio=d_audio->sh=NULL; // failed to init :( } mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |