[vlc-commits] aout: file: remove abort()

Francois Cartegnie git at videolan.org
Wed Jul 20 16:25:03 CEST 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 20 15:23:02 2016 +0200| [c2874a611eb37e1ef5eb0c12a53e13c14c02ee34] | committer: Francois Cartegnie

aout: file: remove abort()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c2874a611eb37e1ef5eb0c12a53e13c14c02ee34
---

 modules/audio_output/file.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index f34c4c7..3a36aa9 100644
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -167,7 +167,13 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
 
     /* Audio format */
     psz_format = var_InheritString( p_aout, "audiofile-format" );
-    if ( !psz_format ) abort(); /* FIXME */
+    if ( !psz_format ) /* FIXME */
+    {
+        if( p_aout->sys->p_file != stdout )
+            fclose( p_aout->sys->p_file );
+        free( p_aout->sys );
+        return VLC_EGENERIC;
+    }
 
     while ( *ppsz_compare != NULL )
     {



More information about the vlc-commits mailing list