[vlc-devel] commit: Revert "avcodec: initialise p_dec.fmt_in if it's missing, not fmt_out" (Ilkka Ollakka )
git version control
git at videolan.org
Tue Oct 6 23:28:36 CEST 2009
vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Oct 7 00:28:20 2009 +0300| [f61a5e8ecfcfb693db1c4bf016706bab4c0fab35] | committer: Ilkka Ollakka
Revert "avcodec: initialise p_dec.fmt_in if it's missing, not fmt_out"
back to the drawingboard
This reverts commit 6b55ee51acc957bc92255429f15123c7a5d3cb1e.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f61a5e8ecfcfb693db1c4bf016706bab4c0fab35
---
modules/codec/avcodec/video.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 13b0dba..ea37291 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -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 */
- p_dec->fmt_in.video.i_aspect =
+ p_dec->fmt_out.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 );
- 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_dec->fmt_in.video.i_sar_den
+ p_dec->fmt_out.video.i_sar_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;
}
}
More information about the vlc-devel
mailing list