Changeset 4101032f15bb226d75753f45ed836428aec1725f

Show
Ignore:
Timestamp:
06/28/03 23:16:57 (5 years ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1056835017 +0000
git-parent:

[5793781308febaa53ca656cb7a080ec35abe61b5]

git-author:
Laurent Aimar <fenrir@videolan.org> 1056835017 +0000
Message:
  • ffmpeg : do no try to automatically set ffmpeg-truncated (it's broken
    with .mp4 files)
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/codec/ffmpeg/video.c

    r80c0020 r4101032  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999-2001 VideoLAN 
    5  * $Id: video.c,v 1.32 2003/06/19 21:09:27 gbazin Exp $ 
     5 * $Id: video.c,v 1.33 2003/06/28 21:16:57 fenrir Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
     
    127127    /* Spawn a video output if there is none. First we look for our children, 
    128128     * then we look for any other vout that might be available. */ 
    129     p_vout = vout_Request( p_vdec->p_fifo, NULL
     129    p_vout = vout_Request( p_vdec->p_fifo, p_vdec->p_vout
    130130                           i_width, i_height, i_chroma, i_aspect ); 
    131131#ifdef LIBAVCODEC_PP 
     
    240240#if LIBAVCODEC_BUILD >= 4662 
    241241    i_truncated = config_GetInt( p_vdec->p_fifo, "ffmpeg-truncated" ); 
    242     if( i_truncated == 1 || ( i_truncated == -1 && 
    243         ( p_vdec->p_context->width == 0 || p_vdec->p_context->height == 0 ) ) ) 
     242    if( i_truncated == 1 ) 
     243#if 0 
     244        || 
     245        ( i_truncated == -1 && ( p_vdec->p_context->width == 0 || p_vdec->p_context->height == 0 ) ) ) 
     246#endif 
    244247    { 
    245248        p_vdec->p_context->flags |= CODEC_FLAG_TRUNCATED; 
     
    365368        } 
    366369    } 
     370    p_vdec->p_vout = NULL; 
    367371 
    368372    return( VLC_SUCCESS );