* equalizer : [0] isn't cool, use a define.

[vlc] / modules / codec / theora.c

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index ef2c4adf019298dbda27ad9b76a6e0b5d830592c..02af93a0272d1f1c5e2f51e81f8c92a757a6fd3b 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -217,7 +217,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         {
             p_dec->fmt_out.video.i_aspect = ((int64_t)VOUT_ASPECT_FACTOR) *
                 ( p_sys->ti.aspect_numerator * p_sys->ti.width ) /
-                ( p_sys->ti.aspect_denominator * p_sys->ti_height );
+                ( p_sys->ti.aspect_denominator * p_sys->ti.height );
         }
         else
         {
@@ -491,7 +491,7 @@ static int OpenEncoder( vlc_object_t *p_this )
     p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0');
     p_enc->fmt_out.i_codec = VLC_FOURCC('t','h','e','o');
 
-    sout_ParseCfg( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
+    sout_CfgParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
 
     var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );
     i_quality = val.i_int;
@@ -521,7 +521,8 @@ static int OpenEncoder( vlc_object_t *p_this )
 
     if( p_enc->fmt_in.video.i_aspect )
     {
-        p_sys->ti.aspect_numerator = p_enc->fmt_in.video.i_aspect;
+        p_sys->ti.aspect_numerator =
+            p_enc->fmt_in.video.i_aspect * p_sys->ti.height / p_sys->ti.width;
         p_sys->ti.aspect_denominator = VOUT_ASPECT_FACTOR;
     }
     else