[vlc-commits] Fix --sout-ffmpeg-codec

[Aurelien Nephtali]

vlc | branch: master | Aurelien Nephtali <aurelien.nephtali at gmail.com> | Thu Mar 29 16:13:45 2012 +0000| [01985075405e84ba650bbed85721c95f2042d04a] | committer: Rafaël Carré

Fix --sout-ffmpeg-codec

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01985075405e84ba650bbed85721c95f2042d04a
---

 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 cfb7a27..9bd8619 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -202,6 +202,8 @@ int OpenEncoder( vlc_object_t *p_this )
     float f_val;
     char *psz_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;
@@ -334,8 +336,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;