From 9e6486f204033ea0a8f94183a24c564eb451ad24 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sat, 14 Jun 2003 15:43:39 +0000 Subject: [PATCH] * modules/codec/ffmpeg/*: fix for ffmpeg direct rendering. Direct rendering is now enabled by default. --- modules/codec/ffmpeg/ffmpeg.c | 4 ++-- modules/codec/ffmpeg/video.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index 2e8f745373..2d3f492b31 100644 --- a/modules/codec/ffmpeg/ffmpeg.c +++ b/modules/codec/ffmpeg/ffmpeg.c @@ -2,7 +2,7 @@ * ffmpeg.c: video decoder using ffmpeg library ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ffmpeg.c,v 1.41 2003/06/06 02:23:30 hartman Exp $ + * $Id: ffmpeg.c,v 1.42 2003/06/14 15:43:39 gbazin Exp $ * * Authors: Laurent Aimar * @@ -187,7 +187,7 @@ vlc_module_begin(); set_callbacks( OpenDecoder, NULL ); set_description( _("ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)") ); - add_bool( "ffmpeg-dr", 0, NULL, DR_TEXT, DR_TEXT, VLC_TRUE ); + add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, VLC_TRUE ); add_integer ( "ffmpeg-error-resilience", -1, NULL, ERROR_TEXT, ERROR_LONGTEXT, VLC_TRUE ); add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT, VLC_FALSE ); add_bool( "ffmpeg-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, VLC_FALSE ); diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c index f348a30c8c..66bef66271 100644 --- a/modules/codec/ffmpeg/video.c +++ b/modules/codec/ffmpeg/video.c @@ -2,7 +2,7 @@ * video.c: video decoder using ffmpeg library ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: video.c,v 1.28 2003/05/10 18:16:44 fenrir Exp $ + * $Id: video.c,v 1.29 2003/06/14 15:43:39 gbazin Exp $ * * Authors: Laurent Aimar * Gildas Bazin @@ -266,7 +266,8 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec ) if( config_GetInt( p_vdec->p_fifo, "ffmpeg-dr" ) && p_vdec->p_codec->capabilities & CODEC_CAP_DR1 && - ffmpeg_PixFmtToChroma( p_vdec->p_context->pix_fmt ) ) + ffmpeg_PixFmtToChroma( p_vdec->p_context->pix_fmt ) && + !(p_vdec->p_context->width % 16) && !(p_vdec->p_context->height % 16) ) { /* FIXME: some codecs set pix_fmt only after a frame * has been decoded. */ -- 2.39.2