Skip to content

V
vlc-1.1
Commit f8c7410e authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Don't crash during my demo to the university computer labs. 

  - don't crash when i_output < 0
parent 24b3d069
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/codec/ffmpeg/audio.c
View file @ f8c7410e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* audio.c: audio decoder using ffmpeg library * audio.c: audio decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2003 VideoLAN * Copyright (C) 1999-2003 VideoLAN
* $Id: audio.c,v 1.28 2004/02/25 17:48:52 fenrir Exp $ * $Id: audio.c,v 1.29 2004/02/26 17:07:37 hartman 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>
...@@ -168,7 +168,7 @@ aout_buffer_t *E_( DecodeAudio )( decoder_t *p_dec, block_t **pp_block ) ...@@ -168,7 +168,7 @@ aout_buffer_t *E_( DecodeAudio )( decoder_t *p_dec, block_t **pp_block )
(int16_t*)p_sys->p_output, &i_output, (int16_t*)p_sys->p_output, &i_output,
p_block->p_buffer, p_block->i_buffer ); p_block->p_buffer, p_block->i_buffer );
if( i_used < 0 )//|| i_output == 0 ) if( i_used < 0 || i_output < 0 )
{ {
if( i_used < 0 ) if( i_used < 0 )
msg_Warn( p_dec, "cannot decode one frame (%d bytes)", msg_Warn( p_dec, "cannot decode one frame (%d bytes)",
......
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