X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftelx.c;h=e361760c46b0273fad893a0d9494d15629133009;hb=5ebacd11d10f9acc39afc0b3d41beb280eaac293;hp=bae938705d3385528f15b9edc6f92d36e5c9c4f6;hpb=27d483e9ef7a451397d7857251c8d67097661f1d;p=vlc diff --git a/modules/codec/telx.c b/modules/codec/telx.c index bae938705d..e361760c46 100644 --- a/modules/codec/telx.c +++ b/modules/codec/telx.c @@ -28,12 +28,13 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include -#include #include #include +#include +#include +#include + #include "vlc_vout.h" #include "vlc_bits.h" #include "vlc_codec.h" @@ -69,7 +70,7 @@ static subpicture_t *Decode( decoder_t *, block_t ** ); "your subtitles don't appear.") vlc_module_begin(); - set_description( _("Teletext subtitles decoder") ); + set_description( N_("Teletext subtitles decoder") ); set_shortname( "Teletext" ); set_capability( "decoder", 50 ); set_category( CAT_INPUT ); @@ -183,10 +184,7 @@ static int Open( vlc_object_t *p_this ) p_dec->pf_decode_sub = Decode; p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) ); if( p_sys == NULL ) - { - msg_Err( p_dec, "out of memory" ); return VLC_ENOMEM; - } memset( p_sys, 0, sizeof(decoder_sys_t) ); @@ -456,8 +454,11 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) char psz_line[256]; int i, total; - if( pp_block == NULL || *pp_block == NULL ) return NULL; + if( pp_block == NULL || *pp_block == NULL ) + return NULL; p_block = *pp_block; + if( p_block->i_rate != 0 ) + p_block->i_length = p_block->i_length * p_block->i_rate / INPUT_RATE_DEFAULT; *pp_block = NULL; dbg((p_dec, "start of telx packet with header %2x\n",