X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fkate.c;h=c6244e278efb58e4cd4d202e9bfce1844fe18878;hb=26c146e8ac44d1e23d57c1e950578768c85e4465;hp=501ff1336103320e0cb9e99c6e9a2e799f157a12;hpb=53772811d1d5f1b2a22f36332a500ffac5eba29e;p=vlc diff --git a/modules/codec/kate.c b/modules/codec/kate.c index 501ff13361..c6244e278e 100644 --- a/modules/codec/kate.c +++ b/modules/codec/kate.c @@ -29,6 +29,7 @@ #endif #include +#include #include #include @@ -109,8 +110,8 @@ static void ParseKateComments( decoder_t * ); vlc_module_begin(); - set_shortname( _("Kate")); - set_description( _("Kate text subtitles decoder") ); + set_shortname( N_("Kate")); + set_description( N_("Kate text subtitles decoder") ); set_capability( "decoder", 50 ); set_callbacks( OpenDecoder, CloseDecoder ); set_category( CAT_INPUT ); @@ -119,7 +120,7 @@ vlc_module_begin(); #ifdef ENABLE_PACKETIZER add_submodule(); - set_description( _("Kate text subtitles packetizer") ); + set_description( N_("Kate text subtitles packetizer") ); set_capability( "packetizer", 100 ); set_callbacks( OpenPacketizer, CloseDecoder ); add_shortcut( "kate" ); @@ -158,10 +159,7 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); return VLC_ENOMEM; - } /* init of p_sys */ #ifdef ENABLE_PACKETIZER @@ -563,7 +561,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t p_spu->p_region->psz_text = strdup(ev->text); /* no leak, this actually gets killed by the core */ p_spu->i_start = p_block->i_pts; - p_spu->i_stop = p_block->i_pts + I64C(1000000)*ev->duration*p_sys->ki.gps_denominator/p_sys->ki.gps_numerator; + p_spu->i_stop = p_block->i_pts + INT64_C(1000000)*ev->duration*p_sys->ki.gps_denominator/p_sys->ki.gps_numerator; p_spu->b_ephemer = (p_block->i_length == 0); p_spu->b_absolute = false;