diff options
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/mencoder.c b/mencoder.c index fb0f29e5f4..e69229f33d 100644 --- a/mencoder.c +++ b/mencoder.c @@ -101,22 +101,8 @@ extern int softzoom; extern int flip; -#ifdef HAVE_MP3LAME -int out_audio_codec=ACODEC_VBRMP3; -#else -int out_audio_codec=ACODEC_PCM; -#endif - -int out_video_codec= -#ifdef USE_LIBAVCODEC - VCODEC_LIBAVCODEC; -#else -#ifdef HAVE_DIVX4ENCORE - VCODEC_DIVX4; -#else - VCODEC_COPY; -#endif -#endif +int out_audio_codec=-1; +int out_video_codec=-1; // audio stream skip/resync functions requires only for seeking. // (they should be implemented in the audio codec layer) @@ -481,6 +467,15 @@ sh_video=d_video->sh; sh_video->fps,sh_video->frametime ); + if(sh_audio && out_audio_codec<0){ + mp_msg(MSGT_MENCODER,MSGL_FATAL,"\nNo audio encoder (-oac) selected! Select one or use -nosound. Use -oac help !\n"); + mencoder_exit(1,NULL); + } + if(sh_video && out_video_codec<0){ + mp_msg(MSGT_MENCODER,MSGL_FATAL,"\nNo video encoder (-ovc) selected! Select one, use -ovc help !\n"); + mencoder_exit(1,NULL); + } + if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf)){ // Go through the codec.conf and find the best codec... sh_audio->codec=NULL; |