]> git.sesse.net Git - vlc/commitdiff
avcodec: initialise p_dec.fmt_in if it's missing, not fmt_out
authorIlkka Ollakka <ileoo@videolan.org>
Tue, 6 Oct 2009 21:13:50 +0000 (00:13 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Tue, 6 Oct 2009 21:22:01 +0000 (00:22 +0300)
modules/codec/avcodec/video.c

index ea3729145c23634442991a20571cac1d4e8daf3c..13b0dbafff6f977bc5491913d37731c5cc0b3df0 100644 (file)
@@ -641,18 +641,18 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
         if( !p_dec->fmt_in.video.i_aspect )
         {
             /* Fetch again the aspect ratio in case it changed */
         if( !p_dec->fmt_in.video.i_aspect )
         {
             /* Fetch again the aspect ratio in case it changed */
-            p_dec->fmt_out.video.i_aspect =
+            p_dec->fmt_in.video.i_aspect =
                 VOUT_ASPECT_FACTOR
                     * ( av_q2d(p_sys->p_context->sample_aspect_ratio)
                     * p_sys->p_context->width / p_sys->p_context->height );
                 VOUT_ASPECT_FACTOR
                     * ( av_q2d(p_sys->p_context->sample_aspect_ratio)
                     * p_sys->p_context->width / p_sys->p_context->height );
-            p_dec->fmt_out.video.i_sar_num
+            p_dec->fmt_in.video.i_sar_num
                 = p_sys->p_context->sample_aspect_ratio.num;
                 = p_sys->p_context->sample_aspect_ratio.num;
-            p_dec->fmt_out.video.i_sar_den
+            p_dec->fmt_in.video.i_sar_den
                 = p_sys->p_context->sample_aspect_ratio.den;
 
                 = p_sys->p_context->sample_aspect_ratio.den;
 
-            if( p_dec->fmt_out.video.i_aspect == 0 )
+            if( p_dec->fmt_in.video.i_aspect == 0 )
             {
             {
-                p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR
+                p_dec->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR
                     * p_sys->p_context->width / p_sys->p_context->height;
             }
         }
                     * p_sys->p_context->width / p_sys->p_context->height;
             }
         }