* 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 :((

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index fe3b6b3d93e9d13b946aa5e5ca9ed9000f2fa5a0..f5d059dfd008e1dbcb5eed476b0994efee58db8d 100644 (file)
--- 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.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>
  *
@@ -164,7 +164,7 @@ vlc_module_begin();
     add_integer ( "ffmpeg-workaround-bugs", 1, NULL,
                   "workaround bugs", WORKAROUND_BUGS_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_integer( "ffmpeg-pp-q", 0, NULL,

diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index f2ed6a2b8d6d4fdbe283c1fc1825762a7805fea7..17cdf61b743ca72cb5482d137c079a2594f569b6 100644 (file)
--- 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.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>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -232,7 +232,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
 
     /* FIXME search real LIBAVCODEC_BUILD */
 #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;
     }