Skip to content

V
vlc-1.1
Commit 4101032f authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* ffmpeg : do no try to automatically set ffmpeg-truncated (it's broken 

 with .mp4 files)
parent 57937813
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
modules/codec/ffmpeg/video.c
View file @ 4101032f
......@@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.32 2003/06/19 21:09:27 gbazin Exp $
* $Id: video.c,v 1.33 2003/06/28 21:16:57 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -126,7 +126,7 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
/* Spawn a video output if there is none. First we look for our children,
* then we look for any other vout that might be available. */
p_vout = vout_Request( p_vdec->p_fifo, NULL,
p_vout = vout_Request( p_vdec->p_fifo, p_vdec->p_vout,
i_width, i_height, i_chroma, i_aspect );
#ifdef LIBAVCODEC_PP
if( p_vdec->pp_mode && !p_vdec->pp_context )
......@@ -239,8 +239,11 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
/* FIXME search real LIBAVCODEC_BUILD */
#if LIBAVCODEC_BUILD >= 4662
i_truncated = config_GetInt( p_vdec->p_fifo, "ffmpeg-truncated" );
if( i_truncated == 1 || ( i_truncated == -1 &&
( p_vdec->p_context->width == 0 || p_vdec->p_context->height == 0 ) ) )
if( i_truncated == 1 )
#if 0
||
( i_truncated == -1 && ( p_vdec->p_context->width == 0 || p_vdec->p_context->height == 0 ) ) )
#endif
{
p_vdec->p_context->flags |= CODEC_FLAG_TRUNCATED;
}
......@@ -364,6 +367,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
i_size );
}
}
p_vdec->p_vout = NULL;
return( VLC_SUCCESS );
}
......
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