# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#define SOUT_CFG_PREFIX "sout-display-"
-vlc_module_begin();
- set_shortname( _("Display"));
- set_description( _("Display stream output") );
- set_capability( "sout stream", 50 );
- add_shortcut( "display" );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
- add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
- AUDIO_LONGTEXT, true );
- add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
- VIDEO_LONGTEXT, true );
+vlc_module_begin ()
+ set_shortname( N_("Display"))
+ set_description( N_("Display stream output") )
+ set_capability( "sout stream", 50 )
+ add_shortcut( "display" )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_STREAM )
+ add_bool( SOUT_CFG_PREFIX "audio", true, NULL, AUDIO_TEXT,
+ AUDIO_LONGTEXT, true )
+ add_bool( SOUT_CFG_PREFIX "video", true, NULL, VIDEO_TEXT,
+ VIDEO_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
- DELAY_LONGTEXT, true );
- set_callbacks( Open, Close );
-vlc_module_end();
+ DELAY_LONGTEXT, true )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"audio", "video", "delay", NULL
};
}
}
- id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, true );
+ id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, NULL, NULL );
if( id->p_dec == NULL )
{
msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",
if( id->p_dec && p_buffer->i_buffer > 0 )
{
- if( p_buffer->i_dts <= 0 )
- p_buffer->i_dts= 0;
+ if( p_buffer->i_dts <= VLC_TS_INVALID )
+ p_buffer->i_dts = 0;
else
p_buffer->i_dts += p_sys->i_delay;
- if( p_buffer->i_pts <= 0 )
- p_buffer->i_pts= 0;
+ if( p_buffer->i_pts <= VLC_TS_INVALID )
+ p_buffer->i_pts = 0;
else
p_buffer->i_pts += p_sys->i_delay;
- input_DecoderDecode( id->p_dec, p_buffer );
+ input_DecoderDecode( id->p_dec, p_buffer, false );
}
p_buffer = p_next;