From 451ec22f8f0dd379d433baba645f0d0f0067806a Mon Sep 17 00:00:00 2001
From: reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 22 Feb 2005 15:13:28 +0000
Subject: [PATCH] fix missing check against lame_init_params that was leading
 to video only files on low (under 32) audio bitrates

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14763 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 help/help_mp-en.h | 3 +++
 help/help_mp-es.h | 3 +++
 mencoder.c        | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 9280af5a54..b5a04c8532 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -337,6 +337,9 @@ static char help_text[]=
 "mw-us => 40kbps/mono        voice => 56kbps/mono\n"\
 "fm/radio/tape => 112kbps    hifi => 160kbps\n"\
 "cd => 192kbps               studio => 256kbps"
+#define MSGTR_LameCantInit "can't set Lame options, check bitrate/samplerate,"\
+" some very low bitrates (<32) need lower samplerates (i.e. -srate 8000). "\
+"if everything else fails, try a preset."
 #define MSGTR_ConfigfileError "configfile error"
 #define MSGTR_ErrorParsingCommandLine "error parsing cmdline"
 #define MSGTR_VideoStreamRequired "Video stream is mandatory!\n"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index a1afde756d..f3684d0218 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -308,6 +308,9 @@ static char help_text[]=
 "mw-us => 40kbps/mono        voice => 56kbps/mono\n"\
 "fm/radio/tape => 112kbps    hifi => 160kbps\n"\
 "cd => 192kbps               studio => 256kbps"
+#define MSGTR_LameCantInit "No se pudo setear las opciones de Lame, revise el"\
+" bitrate/samplerate, algunos bitrates muy bajos (<32) necesitan una tasa de"\
+" muestreo más baja (ej. -srate 8000). Si todo falla, pruebe con un preset."
 #define MSGTR_ConfigfileError "error en archivo de configuración"
 #define MSGTR_ErrorParsingCommandLine "error en parametros de la línea de comando"
 #define MSGTR_VideoStreamRequired "ˇEl flujo de video es obligatorio!\n"
diff --git a/mencoder.c b/mencoder.c
index ba2d180cd6..51868d8e10 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -1110,7 +1110,10 @@ if(lame_param_preset != NULL){
   lame_presets_set(lame,lame_param_fast, (lame_param_vbr==0), lame_param_preset);
 }
 #endif
-lame_init_params(lame);
+if(lame_init_params(lame) == -1){
+    mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_LameCantInit); 
+    mencoder_exit(1,NULL);
+}
 if(verbose>0){
     lame_print_config(lame);
     lame_print_internals(lame);