Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
bb11f00e
Commit
bb11f00e
authored
Dec 06, 2003
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always use correct datatypes.
parent
5b4900ed
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
modules/misc/freetype.c
modules/misc/freetype.c
+4
-3
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+3
-2
No files found.
modules/misc/freetype.c
View file @
bb11f00e
...
...
@@ -2,7 +2,7 @@
* freetype.c : Put text on the video, using freetype2
*****************************************************************************
* Copyright (C) 2002, 2003 VideoLAN
* $Id: freetype.c,v 1.3
5 2003/11/22 00:41:07 titer
Exp $
* $Id: freetype.c,v 1.3
6 2003/12/06 22:53:07 jpsaman
Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
...
...
@@ -73,8 +73,9 @@ static void RenderYUY2( vout_thread_t *, picture_t *,
const
subpicture_t
*
);
static
void
RenderRV32
(
vout_thread_t
*
,
picture_t
*
,
const
subpicture_t
*
);
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
);
static
void
FreeString
(
subpicture_t
*
);
#if !defined(HAVE_ICONV)
...
...
@@ -629,7 +630,7 @@ static void RenderRV32( vout_thread_t *p_vout, picture_t *p_pic,
* needed glyphs into memory. It is used as pf_add_string callback in
* the vout method by this module
*/
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_hmargin
,
int
i_vmargin
,
mtime_t
i_start
,
mtime_t
i_stop
)
{
...
...
modules/stream_out/transcode.c
View file @
bb11f00e
...
...
@@ -2,7 +2,7 @@
* transcode.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: transcode.c,v 1.5
8 2003/12/05 00:03:54 gbazi
n Exp $
* $Id: transcode.c,v 1.5
9 2003/12/06 22:53:07 jpsama
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -889,7 +889,8 @@ static int transcode_audio_ffmpeg_process( sout_stream_t *p_stream,
if
(
id
->
f_src
.
audio
.
i_channels
!=
id
->
p_encoder
->
fmt_in
.
audio
.
i_channels
)
{
int
i
,
j
;
unsigned
int
i
;
int
j
;
/* This is for liba52 which is what ffmpeg uses to decode ac3 */
static
const
int
translation
[
7
][
6
]
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment