Commit 2d037953 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

* all: do not use p_fifo.

parent 53d9b1b2
......@@ -2,7 +2,7 @@
* video.c: video decoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.48 2003/11/22 23:39:14 fenrir Exp $
* $Id: video.c,v 1.49 2003/11/23 03:55:01 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -602,7 +602,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
default:
msg_Err( p_dec, "don't know how to convert chroma %i",
p_sys->p_context->pix_fmt );
p_dec->p_fifo->b_error = 1;
p_dec->b_error = 1;
break;
}
}
......
......@@ -2,7 +2,7 @@
* subsdec.c : text subtitles decoder
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: subsdec.c,v 1.11 2003/11/22 23:39:14 fenrir Exp $
* $Id: subsdec.c,v 1.12 2003/11/23 03:55:01 fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Samuel Hocevar <sam@zoy.org>
......@@ -310,7 +310,7 @@ static void ParseText( decoder_t *p_dec, block_t *p_block,
}
#endif
if( p_dec->p_fifo->i_fourcc == VLC_FOURCC('s','s','a',' ') )
if( p_dec->fmt_in.i_codec == VLC_FOURCC('s','s','a',' ') )
{
/* Decode SSA strings */
/* We expect: ReadOrder, Layer, Style, Name, MarginL, MarginR, MarginV, Effect, Text */
......
......@@ -2,7 +2,7 @@
* 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 $
* $Id: tarkin.c,v 1.10 2003/11/23 03:55:01 fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -188,7 +188,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;
}
......@@ -308,8 +308,7 @@ static void tarkin_CopyPicture( decoder_t *p_dec, picture_t *p_pic,
for( i_line = 0; i_line < p_pic->p[i_plane].i_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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment