Commit 3c74cac8 authored by Gildas Bazin's avatar Gildas Bazin

* modules/codec/ffmpeg/: don't re-use the same pts twice.

* src/misc/modules.c: win32 fix for when module fails loading.
parent c729eee9
......@@ -2,7 +2,7 @@
* audio.c: audio decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2003 VideoLAN
* $Id: audio.c,v 1.23 2003/11/17 02:52:39 fenrir Exp $
* $Id: audio.c,v 1.24 2003/11/19 13:10:48 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -212,8 +212,8 @@ aout_buffer_t *E_( DecodeAudio )( decoder_t *p_dec, block_t **pp_block )
p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
{
aout_DateSet( &p_sys->end_date, p_block->i_pts );
p_block->i_pts = 0;
}
p_block->i_pts = 0;
/* **** Now we can output these samples **** */
i_samples = i_output / 2 / p_sys->p_context->channels;
......
......@@ -2,7 +2,7 @@
* video.c: video decoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.46 2003/11/17 02:52:39 fenrir Exp $
* $Id: video.c,v 1.47 2003/11/19 13:10:48 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -353,6 +353,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
if( p_block->i_pts > 0 )
{
p_sys->input_pts = p_block->i_pts;
p_block->i_pts = 0; /* Make sure we don't reuse the same pts twice */
}
/* TODO implement it in a better way */
......
......@@ -2,7 +2,7 @@
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.139 2003/11/19 10:17:51 gbazin Exp $
* $Id: modules.c,v 1.140 2003/11/19 13:10:48 gbazin Exp $
*
* Authors: Sam Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -862,13 +862,12 @@ static int AllocatePluginFile( vlc_object_t * p_this, MYCHAR * psz_file )
}
#elif defined(HAVE_DL_WINDOWS) && defined(WIN32)
char psz_filename[MAX_PATH];
handle = LoadLibrary( psz_file );
if( handle == NULL )
{
char *psz_error = GetWindowsError();
msg_Warn( p_this, "cannot load module `%s' (%s)",
psz_filename, psz_error );
psz_file, psz_error );
free( psz_error );
}
......
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