Skip to content

V
vlc-2-2
Commit 1aa3e5ac authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/codec/theora.c: correct encoding aspect ratio.

parent 7b55e81c
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/codec/theora.c
View file @ 1aa3e5ac
...@@ -217,7 +217,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -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_dec->fmt_out.video.i_aspect = ((int64_t)VOUT_ASPECT_FACTOR) *
( p_sys->ti.aspect_numerator * p_sys->ti.width ) / ( 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 else
{ {
...@@ -521,7 +521,8 @@ static int OpenEncoder( vlc_object_t *p_this ) ...@@ -521,7 +521,8 @@ static int OpenEncoder( vlc_object_t *p_this )
if( p_enc->fmt_in.video.i_aspect ) 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; p_sys->ti.aspect_denominator = VOUT_ASPECT_FACTOR;
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment