summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-31 17:51:39 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-31 17:51:39 +0000
commit2fe0411b9af1fc1368d4e4713183caa4593f6ae7 (patch)
treee6a77f3642e3707836ca3a8ae2938d7ff54e6b18 /libmpcodecs
parentfad572fc72cea0fb7821e8c1638a259901166d00 (diff)
downloadmpv-2fe0411b9af1fc1368d4e4713183caa4593f6ae7.tar.bz2
mpv-2fe0411b9af1fc1368d4e4713183caa4593f6ae7.tar.xz
allow to specify the audio bitrate in bits (some codecs need that ...)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23977 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ae_lavc.c5
-rw-r--r--libmpcodecs/ve_lavc.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index f757657bb5..41e2274422 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -201,7 +201,10 @@ int mpae_init_lavc(audio_encoder_t *encoder)
// put sample parameters
lavc_actx->channels = encoder->params.channels;
lavc_actx->sample_rate = encoder->params.sample_rate;
- lavc_actx->bit_rate = encoder->params.bitrate = lavc_param_abitrate * 1000;
+ if(lavc_param_abitrate<1000)
+ lavc_actx->bit_rate = encoder->params.bitrate = lavc_param_abitrate * 1000;
+ else
+ lavc_actx->bit_rate = encoder->params.bitrate = lavc_param_abitrate;
/*
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index c2e1404662..cda53a0a9f 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -166,7 +166,7 @@ int lavc_param_audio_global_header= 0;
#ifdef USE_LIBAVCODEC
m_option_t lavcopts_conf[]={
{"acodec", &lavc_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"abitrate", &lavc_param_abitrate, CONF_TYPE_INT, CONF_RANGE, 1, 1000, NULL},
+ {"abitrate", &lavc_param_abitrate, CONF_TYPE_INT, CONF_RANGE, 1, 1000000, NULL},
{"atag", &lavc_param_atag, CONF_TYPE_INT, CONF_RANGE, 0, 0xffff, NULL},
{"vcodec", &lavc_param_vcodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"vbitrate", &lavc_param_vbitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},