Theora framesize calculation patch by Kevin H. Patterson (kevpatt at khptech dot...

diff --git a/THANKS b/THANKS
index c1414056cab27b097e04b6cf5eea9cc992cc62dc..0a4d48d019b75555652a01ecce0b56fcdb590fec 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -83,6 +83,7 @@ John Paul Lorenti <jpl31 at columbia.edu> - ALSA device selection patch
 Jonas Larsen <jonas at vrt.dk> - Danish translation
 Julien Blache <jb at technologeek.org> - disc ejection code
 kty0ne - WinAmp 5 skin for VLC
+Kevin H. Patterson <kevpatt at khptech dot com> - Theora framesize calculation patch by Kevin H. Patterson (kevpatt at khptech dot com
 Laurent Jonqueres <laurent_jonqueres at yahoo.fr> - Occitan localization
 Laurent Mutricy <laurent.mutricy at ecl2005 dot ec-lyon dot fr> - HTTP interface fixes
 Lorena Gomes - Catalan translation

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 1577326546067483969b9f1ef313fc28d511ac47..05d121a48b6e776a55e28cefdf736dd74a6bd71a 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -294,8 +294,8 @@ static int ProcessHeaders( decoder_t *p_dec )
     if( p_sys->ti.aspect_denominator && p_sys->ti.aspect_numerator )
     {
         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_numerator * p_dec->fmt_out.video.i_width ) /
+            ( p_sys->ti.aspect_denominator * p_dec->fmt_out.video.i_height );
     }
     else
     {
@@ -557,7 +557,7 @@ static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic,
             i_src_yoffset /= 2;
         }
 
-        p_src += (i_src_yoffset * i_src_stride + i_src_yoffset);
+        p_src += (i_src_yoffset * i_src_stride + i_src_xoffset);
 
         for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
         {