/*****************************************************************************
* tarkin.c: tarkin decoder module making use of libtarkin.
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: tarkin.c,v 1.11 2004/01/25 18:20:12 bigben Exp $
+ * Copyright (C) 2001-2003 the VideoLAN team
+ * $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <vlc/vlc.h>
+#include <vlc_codec.h>
+#include <vlc_vout.h>
#include <ogg/ogg.h>
/* FIXME */
vlc_module_begin();
set_description( _("Tarkin decoder module") );
set_capability( "decoder", 100 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_VCODEC );
set_callbacks( OpenDecoder, CloseDecoder );
add_shortcut( "tarkin" );
vlc_module_end();
if( tarkin_synthesis_headerin( &p_sys->ti, &p_sys->tc, &oggpacket )
< 0 )
{
- msg_Err( p_dec, "This bitstream does not contain Tarkin "
+ msg_Err( p_dec, "this bitstream does not contain Tarkin "
"video data.");
block_Release( p_block );
return NULL;
i_dst_stride = p_pic->p[i_plane].i_pitch;
i_src_stride = i_pitch;
- for( i_line = 0; i_line < p_pic->p[i_plane].i_lines; i_line++ )
+ for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_src_stride );
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_src_stride );
p_src += i_src_stride;
p_dst += i_dst_stride;