Commit ca802dc8 authored by Jean-Paul Saman's avatar Jean-Paul Saman

All AddText( vout_thread_t *p_vout, char *psz_string, .. ) calls have as...

All AddText( vout_thread_t *p_vout, char *psz_string, .. ) calls have as second argument char * now, just like the function definition in include/video_output.h. All uses already passed a char * to the AddText() functions.
parent f9a82972
......@@ -2,7 +2,7 @@
* video_output.h : video output thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_output.h,v 1.103 2003/12/04 16:49:43 sam Exp $
* $Id: video_output.h,v 1.104 2003/12/07 19:09:37 jpsaman Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -141,7 +141,7 @@ struct vout_thread_t
the text renderer */
module_t * p_text_renderer_module; /**< text renderer module */
/** callback used when a new string needs to be shown on the vout */
int ( *pf_add_string ) ( vout_thread_t *, byte_t *, text_style_t *, int,
int ( *pf_add_string ) ( vout_thread_t *, char *, text_style_t *, int,
int, int, mtime_t, mtime_t );
};
......
......@@ -2,7 +2,7 @@
* renderer.c : dummy text rendering functions
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: renderer.c,v 1.2 2003/12/04 16:49:43 sam Exp $
* $Id: renderer.c,v 1.3 2003/12/07 19:09:37 jpsaman Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -24,7 +24,7 @@
#include <vlc/vlc.h>
#include <vlc/vout.h>
static int AddText ( vout_thread_t *, byte_t *, text_style_t *, int,
static int AddText ( vout_thread_t *, char *, text_style_t *, int,
int, int, mtime_t, mtime_t );
int E_(OpenRenderer)( vlc_object_t *p_this )
......@@ -34,7 +34,7 @@ int E_(OpenRenderer)( vlc_object_t *p_this )
return VLC_SUCCESS;
}
static int AddText ( vout_thread_t *p_vout, byte_t *psz_string,
static int AddText ( vout_thread_t *p_vout, char *psz_string,
text_style_t *p_style , int i_flags, int i_x_margin,
int i_y_margin, mtime_t i_start, mtime_t i_stop )
{
......
......@@ -2,7 +2,7 @@
* transcode.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: transcode.c,v 1.61 2003/12/07 17:09:33 gbazin Exp $
* $Id: transcode.c,v 1.62 2003/12/07 19:09:37 jpsaman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -369,7 +369,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/* create dst format */
id->f_dst.i_cat = AUDIO_ES;
id->f_dst.i_codec = p_sys->i_acodec;
id->f_dst.i_codec = p_sys->i_acodec;
id->f_dst.audio.i_rate = p_sys->i_sample_rate > 0 ? p_sys->i_sample_rate : id->f_src.audio.i_rate;
id->f_dst.audio.i_channels = p_sys->i_channels > 0 ? p_sys->i_channels : id->f_src.audio.i_channels;
id->f_dst.i_bitrate = p_sys->i_abitrate > 0 ? p_sys->i_abitrate : 64000;
......
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