# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include "vlc_codec.h"
#define FPS_TEXT N_("Frames per Second")
#define FPS_LONGTEXT N_("Desired frame rate for the VC-1 stream.")
-vlc_module_begin();
- set_shortname( "VC-1");
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("VC1 video demuxer" ) );
- set_capability( "demux", 0 );
- add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true );
- set_callbacks( Open, Close );
- add_shortcut( "vc1" );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "VC-1")
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_description( N_("VC1 video demuxer" ) )
+ set_capability( "demux", 0 )
+ add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+ set_callbacks( Open, Close )
+ add_shortcut( "vc1" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
const uint8_t *p_peek;
- vlc_value_t val;
+ es_format_t fmt;
if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
p_sys->p_es = NULL;
p_sys->i_dts = 1;
p_sys->f_fps = var_CreateGetFloat( p_demux, "vc1-fps" );
- if( val.f_float < 0.001 ) p_sys->f_fps = 0.0;
+ if( p_sys->f_fps < 0.001 )
+ p_sys->f_fps = 0.0;
/* Load the packetizer */
- INIT_VPACKETIZER( p_sys->p_packetizer, 'W', 'V', 'C', '1' );
- es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
- LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "VC-1" );
-
+ es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'W', 'V', 'C', '1' ) );
+ p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "VC-1" );
+ if( !p_sys->p_packetizer )
+ {
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
return VLC_SUCCESS;
}
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- DESTROY_PACKETIZER( p_sys->p_packetizer );
-
+ demux_PacketizerDestroy( p_sys->p_packetizer );
free( p_sys );
}