X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fdts.c;h=4b00f3a9c2eedd16c74b74d516c948e7197d437c;hb=74e39ff5c2338562f55aba264ac70ed7f1b43e85;hp=04d1ff88d4416106fa93b38a4623cbcad83557e4;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc diff --git a/modules/demux/dts.c b/modules/demux/dts.c index 04d1ff88d4..4b00f3a9c2 100644 --- a/modules/demux/dts.c +++ b/modules/demux/dts.c @@ -28,7 +28,8 @@ # include "config.h" #endif -#include +#include +#include #include #include @@ -41,8 +42,8 @@ static void Close ( vlc_object_t * ); vlc_module_begin(); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( _("Raw DTS demuxer") ); - set_capability( "demux2", 155 ); + set_description( N_("Raw DTS demuxer") ); + set_capability( "demux", 155 ); set_callbacks( Open, Close ); add_shortcut( "dts" ); vlc_module_end(); @@ -77,7 +78,7 @@ static int Open( vlc_object_t * p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - const byte_t *p_peek; + const uint8_t *p_peek; int i_peek = 0; /* Check if we are dealing with a WAV file */ @@ -208,7 +209,7 @@ static int Demux( demux_t *p_demux ) if( p_block_out->i_length ) { p_sys->i_mux_rate = - p_block_out->i_buffer * I64C(1000000) / p_block_out->i_length; + p_block_out->i_buffer * INT64_C(1000000) / p_block_out->i_length; } /* set PCR */ @@ -232,7 +233,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) if( i_query == DEMUX_SET_TIME ) return VLC_EGENERIC; else - return demux2_vaControlHelper( p_demux->s, + return demux_vaControlHelper( p_demux->s, 0, -1, 8*p_sys->i_mux_rate, 1, i_query, args ); }