X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fcopy.c;h=e62ce1bdd250eba1a4f165cb16694d27002d9068;hb=5ebacd11d10f9acc39afc0b3d41beb280eaac293;hp=c509c48ebe6d3f3326a560ff4b493151f2646f83;hpb=de90c15151187e74ce4d2e89a34d68fd64b8735f;p=vlc diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c index c509c48ebe..e62ce1bdd2 100644 --- a/modules/packetizer/copy.c +++ b/modules/packetizer/copy.c @@ -25,9 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -40,7 +44,7 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_PACKETIZER ); - set_description( _("Copy packetizer") ); + set_description( N_("Copy packetizer") ); set_capability( "packetizer", 1 ); set_callbacks( Open, Close ); vlc_module_end(); @@ -256,9 +260,13 @@ static block_t *Packetize ( decoder_t *p_dec, block_t **pp_block ) block_t *p_ret = p_dec->p_sys->p_block; if( pp_block == NULL || *pp_block == NULL ) + return NULL; + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { + block_Release( *pp_block ); return NULL; } + p_block = *pp_block; *pp_block = NULL; @@ -291,9 +299,13 @@ static block_t *PacketizeSub( decoder_t *p_dec, block_t **pp_block ) block_t *p_block; if( pp_block == NULL || *pp_block == NULL ) + return NULL; + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { + block_Release( *pp_block ); return NULL; } + p_block = *pp_block; *pp_block = NULL;