[vlc-commits] aiff: check ES just once

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May  3 11:48:42 2018 +0300| [222b67381e3f41b560b40b1bb62e8a21f299ec88] | committer: Rémi Denis-Courmont

aiff: check ES just once

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

 modules/demux/aiff.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index 0090ef059a..f36e61dd26 100644
--- a/modules/demux/aiff.c
+++ b/modules/demux/aiff.c
@@ -207,6 +207,8 @@ static int Open( vlc_object_t *p_this )
 
     /* */
     p_sys->es = es_out_Add( p_demux->out, &p_sys->fmt );
+    if( unlikely(p_sys->es == NULL) )
+        return VLC_ENOMEM;
 
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
@@ -255,11 +257,7 @@ static int Demux( demux_t *p_demux )
                      p_sys->fmt.audio.i_rate;
 
     /* */
-    if( p_sys->es )
-        es_out_Send( p_demux->out, p_sys->es, p_block );
-    else
-        block_Release( p_block );
-
+    es_out_Send( p_demux->out, p_sys->es, p_block );
     return VLC_DEMUXER_SUCCESS;
 }