X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftarkin.c;h=cfff76e0b19d8b5ee1cb09a00d9bb8f875fe1377;hb=8499b6cda49a4461cf8546a3cfdd845c1c870d4d;hp=569d0f6326b92ad99d266c81b9083bd2e0075069;hpb=42886fbe364906f917eed96fa2237b081e426532;p=vlc

diff --git a/modules/codec/tarkin.c b/modules/codec/tarkin.c
index 569d0f6326..cfff76e0b1 100644
--- a/modules/codec/tarkin.c
+++ b/modules/codec/tarkin.c
@@ -2,7 +2,7 @@
  * tarkin.c: tarkin decoder module making use of libtarkin.
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: tarkin.c,v 1.8 2003/11/22 15:06:50 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -25,7 +25,6 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/input.h>
 #include <vlc/decoder.h>
 
 #include <ogg/ogg.h>
@@ -75,6 +74,8 @@ static void tarkin_CopyPicture( decoder_t *, picture_t *, uint8_t *, int );
 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();
@@ -160,7 +161,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             < 0 )
         {
             msg_Err( p_dec, "This bitstream does not contain Tarkin "
-                     "video data");
+                     "video data.");
             block_Release( p_block );
             return NULL;
         }
@@ -175,7 +176,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         if( tarkin_synthesis_headerin( &p_sys->ti, &p_sys->tc, &oggpacket )
             < 0 )
         {
-            msg_Err( p_dec, "2nd Tarkin header is corrupted" );
+            msg_Err( p_dec, "2nd Tarkin header is corrupted." );
             block_Release( p_block );
             return NULL;
         }
@@ -189,7 +190,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         if( tarkin_synthesis_headerin( &p_sys->ti, &p_sys->tc, &oggpacket )
             < 0 )
         {
-            msg_Err( p_dec->p_fifo, "3rd Tarkin header is corrupted" );
+            msg_Err( p_dec, "3rd Tarkin header is corrupted." );
             block_Release( p_block );
             return NULL;
         }
@@ -307,10 +308,9 @@ static void tarkin_CopyPicture( decoder_t *p_dec, picture_t *p_pic,
         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_fifo->p_vlc->pf_memcpy( p_dst, p_src,
-                                             i_src_stride );
+            p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_src_stride );
 
             p_src += i_src_stride;
             p_dst += i_dst_stride;