Commit f61a5e8e authored by Ilkka Ollakka's avatar Ilkka Ollakka

Revert "avcodec: initialise p_dec.fmt_in if it's missing, not fmt_out"

back to the drawingboard
This reverts commit 6b55ee51.
parent 4953db85
...@@ -641,18 +641,18 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) ...@@ -641,18 +641,18 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
if( !p_dec->fmt_in.video.i_aspect ) if( !p_dec->fmt_in.video.i_aspect )
{ {
/* Fetch again the aspect ratio in case it changed */ /* Fetch again the aspect ratio in case it changed */
p_dec->fmt_in.video.i_aspect = p_dec->fmt_out.video.i_aspect =
VOUT_ASPECT_FACTOR VOUT_ASPECT_FACTOR
* ( av_q2d(p_sys->p_context->sample_aspect_ratio) * ( av_q2d(p_sys->p_context->sample_aspect_ratio)
* p_sys->p_context->width / p_sys->p_context->height ); * p_sys->p_context->width / p_sys->p_context->height );
p_dec->fmt_in.video.i_sar_num p_dec->fmt_out.video.i_sar_num
= p_sys->p_context->sample_aspect_ratio.num; = p_sys->p_context->sample_aspect_ratio.num;
p_dec->fmt_in.video.i_sar_den p_dec->fmt_out.video.i_sar_den
= p_sys->p_context->sample_aspect_ratio.den; = p_sys->p_context->sample_aspect_ratio.den;
if( p_dec->fmt_in.video.i_aspect == 0 ) if( p_dec->fmt_out.video.i_aspect == 0 )
{ {
p_dec->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR p_dec->fmt_out.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;
} }
} }
......
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