[vlc-commits] transcode: fix return handling of aout_FiltersPlay

Thomas Guillem git at videolan.org
Mon Mar 4 11:59:09 CET 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Mar  1 13:09:48 2019 +0100| [6509e74da9e5fe8c82c328e8348659d458336414] | committer: Thomas Guillem

transcode: fix return handling of aout_FiltersPlay

Returning NULL is not an error, a lot of filters do return NULL waiting for
more data.

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

 modules/stream_out/transcode/audio.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index 82578c9077..dd8dac3908 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -337,14 +337,14 @@ int transcode_audio_process( sout_stream_t *p_stream,
 
         /* Run filter chain */
         p_audio_buf = aout_FiltersPlay( id->p_af_chain, p_audio_buf, 1.f );
-        if( !p_audio_buf )
-            goto error;
-
-        p_audio_buf->i_dts = p_audio_buf->i_pts;
+        if( p_audio_buf  )
+        {
+            p_audio_buf->i_dts = p_audio_buf->i_pts;
 
-        block_t *p_block = transcode_encoder_encode( id->encoder, p_audio_buf );
-        block_ChainAppend( out, p_block );
-        block_Release( p_audio_buf );
+            block_t *p_block = transcode_encoder_encode( id->encoder, p_audio_buf );
+            block_ChainAppend( out, p_block );
+            block_Release( p_audio_buf );
+        }
         continue;
 error:
         if( p_audio_buf )



More information about the vlc-commits mailing list