Commit cec1f957 authored by Laurent Aimar's avatar Laurent Aimar

* ffmpeg: do not use CODEC_FLAG_TRUNCATED by default as it seems buggy

with valid files. You have to use --ffmpeg-truncated to force it.
 MPEG-4 in TS won't work unless you use --ffmpeg-truncated :((
parent 4ed6ce25
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library * ffmpeg.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.33 2003/04/27 15:25:11 gbazin Exp $ * $Id: ffmpeg.c,v 1.34 2003/05/07 00:28:38 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -164,7 +164,7 @@ vlc_module_begin(); ...@@ -164,7 +164,7 @@ vlc_module_begin();
add_integer ( "ffmpeg-workaround-bugs", 1, NULL, add_integer ( "ffmpeg-workaround-bugs", 1, NULL,
"workaround bugs", WORKAROUND_BUGS_LONGTEXT, VLC_FALSE ); "workaround bugs", WORKAROUND_BUGS_LONGTEXT, VLC_FALSE );
add_bool( "ffmpeg-hurry-up", 0, NULL, "hurry up", HURRY_UP_LONGTEXT, VLC_FALSE ); add_bool( "ffmpeg-hurry-up", 0, NULL, "hurry up", HURRY_UP_LONGTEXT, VLC_FALSE );
add_bool( "ffmpeg-truncated", VLC_FALSE, NULL, "truncated stream", "truncated stream", VLC_FALSE );
add_category_hint( N_("Post processing"), NULL, VLC_FALSE ); add_category_hint( N_("Post processing"), NULL, VLC_FALSE );
add_integer( "ffmpeg-pp-q", 0, NULL, add_integer( "ffmpeg-pp-q", 0, NULL,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library * video.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.24 2003/04/27 13:03:28 fenrir Exp $ * $Id: video.c,v 1.25 2003/05/07 00:28:38 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -232,7 +232,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec ) ...@@ -232,7 +232,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
/* FIXME search real LIBAVCODEC_BUILD */ /* FIXME search real LIBAVCODEC_BUILD */
#if LIBAVCODEC_BUILD >= 4662 #if LIBAVCODEC_BUILD >= 4662
if( p_vdec->p_codec->capabilities & CODEC_CAP_TRUNCATED ) if( config_GetInt( p_vdec->p_fifo, "ffmpeg-truncated" ) && ( p_vdec->p_codec->capabilities & CODEC_CAP_TRUNCATED ) )
{ {
p_vdec->p_context->flags |= CODEC_FLAG_TRUNCATED; p_vdec->p_context->flags |= CODEC_FLAG_TRUNCATED;
} }
......
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