Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
ce31d545
Commit
ce31d545
authored
Dec 02, 2002
by
Jon Lech Johansen
Browse files
* ALL: Fixed some compiler warnings.
parent
4659a85f
Changes
5
Hide whitespace changes
Inline
Side-by-side
modules/access/mms/mms.c
View file @
ce31d545
...
...
@@ -2,7 +2,7 @@
* mms.c: MMS access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mms.c,v 1.
9
2002/1
1/25 19:12:34 fenrir
Exp $
* $Id: mms.c,v 1.
10
2002/1
2/02 21:13:25 jlj
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -754,7 +754,7 @@ static int MMSOpen( input_thread_t *p_input,
socklen_t
i_namelen
=
sizeof
(
struct
sockaddr_in
);
if
(
getsockname
(
p_access
->
socket_tcp
.
i_handle
,
(
struct
sockaddr
_in
*
)
&
name
,
&
i_namelen
)
<
0
)
(
struct
sockaddr
*
)
&
name
,
&
i_namelen
)
<
0
)
{
msg_Err
(
p_input
,
"for udp you have to provide bind address (mms://<server_addr>@<bind_addr/<path> (FIXME)"
);
...
...
modules/codec/ffmpeg/audio.c
View file @
ce31d545
...
...
@@ -2,7 +2,7 @@
* audio.c: audio decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: audio.c,v 1.
5
2002/1
1/28 16:32:29 fenrir
Exp $
* $Id: audio.c,v 1.
6
2002/1
2/02 21:13:25 jlj
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -43,6 +43,7 @@
# include <sys/times.h>
#endif
#include
"codecs.h"
#include
"aout_internal.h"
#include
"avcodec.h"
/* ffmpeg */
...
...
modules/codec/spudec/spudec.c
View file @
ce31d545
...
...
@@ -2,7 +2,7 @@
* spudec.c : SPU decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: spudec.c,v 1.
8
2002/1
1
/0
6
21:
48:24 gbazin
Exp $
* $Id: spudec.c,v 1.
9
2002/1
2
/0
2
21:
13:25 jlj
Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
...
...
@@ -126,7 +126,7 @@ static int RunDecoder( decoder_fifo_t * p_fifo )
}
else
{
p_font
=
subtitler_LoadFont
(
p_spudec
->
p_vout
,
psz_font
);
p_font
=
E_
(
subtitler_LoadFont
)
(
p_spudec
->
p_vout
,
psz_font
);
if
(
p_font
==
NULL
)
{
msg_Err
(
p_fifo
,
"unable to load font: %s"
,
psz_font
);
...
...
@@ -140,7 +140,7 @@ static int RunDecoder( decoder_fifo_t * p_fifo )
E_
(
ParseText
)(
p_spudec
,
p_font
);
}
if
(
p_font
)
subtitler_UnloadFont
(
p_spudec
->
p_vout
,
p_font
);
if
(
p_font
)
E_
(
subtitler_UnloadFont
)
(
p_spudec
->
p_vout
,
p_font
);
}
else
...
...
modules/codec/spudec/subtitler.c
View file @
ce31d545
...
...
@@ -80,7 +80,7 @@ static void DestroySPU ( subpicture_t * );
* to end:
* 1 byte : 0xff
*****************************************************************************/
subtitler_font_t
*
subtitler_LoadFont
(
vout_thread_t
*
p_vout
,
subtitler_font_t
*
E_
(
subtitler_LoadFont
)
(
vout_thread_t
*
p_vout
,
const
char
*
psz_name
)
{
subtitler_font_t
*
p_font
;
...
...
@@ -154,7 +154,7 @@ subtitler_font_t* subtitler_LoadFont( vout_thread_t * p_vout,
{
msg_Err
(
p_vout
,
"unexpected end of font file '%s'"
,
psz_name
);
close
(
i_file
);
subtitler_UnloadFont
(
p_vout
,
p_font
);
E_
(
subtitler_UnloadFont
)
(
p_vout
,
p_font
);
return
(
NULL
);
}
i_char
=
pi_buffer
[
0
];
...
...
@@ -170,7 +170,7 @@ subtitler_font_t* subtitler_LoadFont( vout_thread_t * p_vout,
{
msg_Err
(
p_vout
,
"unexpected end of font file '%s'"
,
psz_name
);
close
(
i_file
);
subtitler_UnloadFont
(
p_vout
,
p_font
);
E_
(
subtitler_UnloadFont
)
(
p_vout
,
p_font
);
return
(
NULL
);
}
p_font
->
i_width
[
i_char
]
=
pi_buffer
[
0
];
...
...
@@ -185,7 +185,7 @@ subtitler_font_t* subtitler_LoadFont( vout_thread_t * p_vout,
{
msg_Err
(
p_vout
,
"out of memory"
);
close
(
i_file
);
subtitler_UnloadFont
(
p_vout
,
p_font
);
E_
(
subtitler_UnloadFont
)
(
p_vout
,
p_font
);
return
NULL
;
}
for
(
i_line
=
0
;
i_line
<
p_font
->
i_height
;
i_line
++
)
...
...
@@ -200,7 +200,7 @@ subtitler_font_t* subtitler_LoadFont( vout_thread_t * p_vout,
if
(
read
(
i_file
,
pi_buffer
,
1
)
!=
1
)
{
msg_Err
(
p_vout
,
"unexpected end of font file '%s'"
,
psz_name
);
subtitler_UnloadFont
(
p_vout
,
p_font
);
E_
(
subtitler_UnloadFont
)
(
p_vout
,
p_font
);
close
(
i_file
);
return
(
NULL
);
}
...
...
@@ -213,7 +213,7 @@ subtitler_font_t* subtitler_LoadFont( vout_thread_t * p_vout,
if
(
read
(
i_file
,
pi_buffer
,
i_length
*
2
)
!=
i_length
*
2
)
{
msg_Err
(
p_vout
,
"unexpected end of font file '%s'"
,
psz_name
);
subtitler_UnloadFont
(
p_vout
,
p_font
);
E_
(
subtitler_UnloadFont
)
(
p_vout
,
p_font
);
close
(
i_file
);
return
(
NULL
);
}
...
...
@@ -223,7 +223,7 @@ subtitler_font_t* subtitler_LoadFont( vout_thread_t * p_vout,
{
msg_Err
(
p_vout
,
"out of memory"
);
close
(
i_file
);
subtitler_UnloadFont
(
p_vout
,
p_font
);
E_
(
subtitler_UnloadFont
)
(
p_vout
,
p_font
);
return
NULL
;
}
for
(
i
=
0
;
i
<
i_length
;
i
++
)
...
...
@@ -248,7 +248,8 @@ subtitler_font_t* subtitler_LoadFont( vout_thread_t * p_vout,
/*****************************************************************************
* subtitler_UnloadFont: unload a run-length encoded font file from memory
*****************************************************************************/
void
subtitler_UnloadFont
(
vout_thread_t
*
p_vout
,
subtitler_font_t
*
p_font
)
void
E_
(
subtitler_UnloadFont
)(
vout_thread_t
*
p_vout
,
subtitler_font_t
*
p_font
)
{
int
i_char
;
int
i_line
;
...
...
modules/control/rc/rc.c
View file @
ce31d545
...
...
@@ -2,7 +2,7 @@
* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: rc.c,v 1.1
2
2002/1
1/23 20:37:10 sam
Exp $
* $Id: rc.c,v 1.1
3
2002/1
2/02 21:13:25 jlj
Exp $
*
* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
*
...
...
@@ -34,6 +34,7 @@
#include
<vlc/vlc.h>
#include
<vlc/intf.h>
#include
<vlc/aout.h>
#include
<vlc/vout.h>
#ifdef HAVE_UNISTD_H
...
...
@@ -49,6 +50,8 @@
#include
<winsock2.h>
/* select() */
#endif
#include
"error.h"
#define MAX_LINE_LENGTH 256
/*****************************************************************************
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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