* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_demux.h>
#include <vlc_aout.h>
set_description( _("VOC demuxer") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 10 );
+ set_capability( "demux", 10 );
set_callbacks( Open, Close );
vlc_module_end();
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- uint8_t *p_buf;
+ const uint8_t *p_buf;
uint16_t i_data_offset, i_version;
if( stream_Peek( p_demux->s, &p_buf, 26 ) < 26 )
}
break;
- case 8:
- /*
+ case 8:
+ /*
* Block 8 is a big kludge to add stereo support to block 1 :
* A block of type 8 is always followed by a block of type 1
* and specifies the number of channels in that 1-block
/* read subsequent block 1 */
if( stream_Read( p_demux->s, buf, 4 ) < 4 )
return VLC_EGENERIC; /* EOF */
-
+
i_block_size = GetDWLE( buf ) >> 8;
msg_Dbg( p_demux, "new block: type: %u, size: %u",
(unsigned)*buf, i_block_size );
}
break;
- default:
+ default:
msg_Err( p_demux, "unsupported compression" );
return VLC_EGENERIC;
}
{
demux_sys_t *p_sys = p_demux->p_sys;
- return demux2_vaControlHelper( p_demux->s, p_sys->i_block_start,
+ return demux_vaControlHelper( p_demux->s, p_sys->i_block_start,
p_sys->i_block_end,
p_sys->fmt.i_bitrate,
p_sys->fmt.audio.i_blockalign,