[vlc-commits] demux: pva: remove usage of abort
Francois Cartegnie
git at videolan.org
Thu May 3 10:46:53 CEST 2018
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu May 3 10:29:15 2018 +0200| [267b3701f0668c9950a2d80a6d8cfdbc3d814d71] | committer: Francois Cartegnie
demux: pva: remove usage of abort
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=267b3701f0668c9950a2d80a6d8cfdbc3d814d71
---
modules/demux/pva.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index ea3be2f446..1c26da8020 100644
--- a/modules/demux/pva.c
+++ b/modules/demux/pva.c
@@ -221,9 +221,8 @@ static int Demux( demux_t *p_demux )
}
p_frame = block_ChainGather( p_frame );
- if( unlikely(p_frame == NULL) )
- abort();
- es_out_Send( p_demux->out, p_sys->p_video, p_frame );
+ if( likely(p_frame) )
+ es_out_Send( p_demux->out, p_sys->p_video, p_frame );
p_sys->p_es = NULL;
}
@@ -440,7 +439,7 @@ static void ParsePES( demux_t *p_demux )
p_pes = block_ChainGather( p_pes );
if( unlikely(p_pes == NULL) )
- abort();
+ return;
if( p_pes->i_buffer <= i_skip )
{
block_ChainRelease( p_pes );
More information about the vlc-commits
mailing list