X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftarkin.c;h=80f7a9feb078dbdd94d81ce7350bc50b315e40e3;hb=dd5f0b9f0c35ec204432e1fe650053355f511e02;hp=9d1f5327d7d95f273581292f2f60218a6d495650;hpb=61f6d450b1863de272a471d34d35af8d031390da;p=vlc

diff --git a/modules/codec/tarkin.c b/modules/codec/tarkin.c
index 9d1f5327d7..80f7a9feb0 100644
--- a/modules/codec/tarkin.c
+++ b/modules/codec/tarkin.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * tarkin.c: tarkin decoder module making use of libtarkin.
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: tarkin.c,v 1.9 2003/11/22 23:39:14 fenrir Exp $
+ * Copyright (C) 2001-2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -18,15 +18,15 @@
  *
  * 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>
-
+#include <vlc_codec.h>
+#include <vlc_vout.h>
 #include <ogg/ogg.h>
 
 /* FIXME */
@@ -74,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();
@@ -158,8 +160,8 @@ 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, "This bitstream does not contain Tarkin "
-                     "video data");
+            msg_Err( p_dec, "this bitstream does not contain Tarkin "
+                     "video data.");
             block_Release( p_block );
             return NULL;
         }
@@ -174,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;
         }
@@ -188,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;
         }
@@ -306,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_libvlc->pf_memcpy( p_dst, p_src, i_src_stride );
 
             p_src += i_src_stride;
             p_dst += i_dst_stride;