#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
-#include "vlc_codec.h"
+#include <vlc_codec.h>
/*****************************************************************************
* Module descriptor
const uint8_t *p_peek;
es_format_t fmt;
- if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
if( p_peek[0] != 0x00 || p_peek[1] != 0x00 ||
- p_peek[2] != 0x00 || p_peek[3] != 0x01 ||
- p_peek[4] != 0x0f ) /* Sequence header */
+ p_peek[2] != 0x01 || p_peek[3] != 0x0f ) /* Sequence header */
{
if( !p_demux->b_force )
{
p_demux->pf_control= Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
p_sys->p_es = NULL;
- p_sys->i_dts = 1;
+ p_sys->i_dts = 0;
p_sys->f_fps = var_CreateGetFloat( p_demux, "vc1-fps" );
if( p_sys->f_fps < 0.001 )
p_sys->f_fps = 0.0;
/* Load the packetizer */
- es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'W', 'V', 'C', '1' ) );
+ es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_VC1 );
p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "VC-1" );
if( !p_sys->p_packetizer )
{
return 0;
/* */
- p_block_in->i_dts = 1;
- p_block_in->i_pts = 1;
+ p_block_in->i_dts = VLC_TS_0;
+ p_block_in->i_pts = VLC_TS_0;
while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) )
{
p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
}
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
- p_block_out->i_dts = p_sys->i_dts;
- p_block_out->i_pts = p_sys->i_dts;
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_dts );
+ p_block_out->i_dts = VLC_TS_0 + p_sys->i_dts;
+ p_block_out->i_pts = VLC_TS_0 + p_sys->i_dts;
es_out_Send( p_demux->out, p_sys->p_es, p_block_out );