vlc/vlc-2.0 | branch: master | Aurelien Nephtali <[email protected]> | Thu Mar 29 16:13:45 2012 +0000| [223f96c793fc4c05e5b9c638d77a4e2a3ec78698] | committer: Jean-Baptiste Kempf
Fix --sout-ffmpeg-codec Signed-off-by: Rafaël Carré <[email protected]> (cherry picked from commit 01985075405e84ba650bbed85721c95f2042d04a) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=223f96c793fc4c05e5b9c638d77a4e2a3ec78698 --- modules/codec/avcodec/encoder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c index a992e90..8b72e4c 100644 --- a/modules/codec/avcodec/encoder.c +++ b/modules/codec/avcodec/encoder.c @@ -203,6 +203,8 @@ int OpenEncoder( vlc_object_t *p_this ) char *psz_val; int i_val; + config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); + if( p_enc->fmt_out.i_codec == VLC_CODEC_MP3 ) { i_cat = AUDIO_ES; @@ -335,8 +337,6 @@ int OpenEncoder( vlc_object_t *p_this ) p_context->dsp_mask |= AV_CPU_FLAG_SSE2; } - config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); - p_sys->i_key_int = var_GetInteger( p_enc, ENC_CFG_PREFIX "keyint" ); p_sys->i_b_frames = var_GetInteger( p_enc, ENC_CFG_PREFIX "bframes" ); p_sys->i_vtolerance = var_GetInteger( p_enc, ENC_CFG_PREFIX "vt" ) * 1000; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
