* equalizer : [0] isn't cool, use a define.

[vlc] / modules / codec / dv.c

diff --git a/modules/codec/dv.c b/modules/codec/dv.c
index d84b1a7bb99943fb091f39cc20afa6eee7447216..7dfccc6857c114a0906033d3d861887e293e536c 100644 (file)
--- a/modules/codec/dv.c
+++ b/modules/codec/dv.c
@@ -2,7 +2,7 @@
  * dv.c: a decoder for DV video
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: dv.c,v 1.5 2003/09/02 20:19:25 gbazin Exp $
+ * $Id: dv.c,v 1.7 2004/01/25 18:20:12 bigben Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -59,7 +59,7 @@ static int OpenDecoder ( vlc_object_t *p_this )
 {
     decoder_t *p_dec = (decoder_t*)p_this;
 
-    if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('d','v','s','d') )
+    if( p_dec->fmt_in.i_codec != VLC_FOURCC('d','v','s','d') )
     {
         return VLC_EGENERIC;
     }
@@ -94,7 +94,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
     p_decoder = dv_decoder_new( TRUE, FALSE, FALSE );
     if( !p_decoder )
     {
-        msg_Err( p_fifo, "cannot create DV decoder" );
+        msg_Err( p_fifo, "cannot start DV decoder" );
         free( p_buffer );
         p_fifo->b_error = 1;
         DecoderError( p_fifo );
@@ -103,7 +103,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
 
     if( InitBitstream( &bit_stream, p_fifo, NULL, NULL ) != VLC_SUCCESS )
     {
-        msg_Err( p_fifo, "cannot initialise bitstream" );
+        msg_Err( p_fifo, "cannot initialize bitstream" );
         free( p_buffer );
         p_fifo->b_error = 1;
         DecoderError( p_fifo );
@@ -118,19 +118,19 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
         /* Parsing the beginning of the stream */
         if( dv_parse_header( p_decoder, p_buffer ) < 0 )
         {
-            fprintf(stderr, "parse error\n");
+            msg_Err(p_fifo, "parse error");
             p_fifo->b_error = 1;
             break;
         }
 
         if( dv_format_wide( p_decoder ) )
         {
-            msg_Dbg( p_fifo, "aspect is 4:3" );
+            msg_Dbg( p_fifo, "aspect ratio is 4:3" );
             i_aspect = VOUT_ASPECT_FACTOR * 4 / 3;
         }
         else if( dv_format_normal( p_decoder ) )
         {
-            msg_Dbg( p_fifo, "aspect is 16:9" );
+            msg_Dbg( p_fifo, "aspect ratio is 16:9" );
             i_aspect = VOUT_ASPECT_FACTOR * 4/3;//16 / 9;
         }
         else
@@ -190,7 +190,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
 
             if( dv_parse_header( p_decoder, p_buffer ) > 0 )
             {
-                fprintf(stderr, "size changed\n");
+                msg_Warn(p_fifo, "size changed");
             }
 
             if( p_vout && ( !p_decoder->prev_frame_decoded