Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
72fa5a9d
Commit
72fa5a9d
authored
Feb 12, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No need to add a '\n' at the end of messages passed to msg_*
parent
41e414d2
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
59 additions
and
59 deletions
+59
-59
modules/access/cdda/access.c
modules/access/cdda/access.c
+2
-2
modules/access/dv.c
modules/access/dv.c
+2
-2
modules/access/vcd/cdrom.c
modules/access/vcd/cdrom.c
+1
-1
modules/access/vcd/vcd.c
modules/access/vcd/vcd.c
+3
-3
modules/audio_filter/spatializer/spatializer.cpp
modules/audio_filter/spatializer/spatializer.cpp
+7
-7
modules/codec/avcodec/encoder.c
modules/codec/avcodec/encoder.c
+1
-1
modules/codec/dirac.c
modules/codec/dirac.c
+1
-1
modules/codec/kate.c
modules/codec/kate.c
+5
-5
modules/codec/quicktime.c
modules/codec/quicktime.c
+6
-6
modules/control/dbus.c
modules/control/dbus.c
+8
-8
modules/gui/pda/pda_callbacks.c
modules/gui/pda/pda_callbacks.c
+2
-2
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+1
-1
modules/meta_engine/taglib.cpp
modules/meta_engine/taglib.cpp
+1
-1
modules/misc/svg.c
modules/misc/svg.c
+2
-2
modules/services_discovery/sap.c
modules/services_discovery/sap.c
+1
-1
modules/stream_out/mosaic_bridge.c
modules/stream_out/mosaic_bridge.c
+1
-1
modules/video_filter/chain.c
modules/video_filter/chain.c
+2
-2
modules/video_filter/opencv_example.cpp
modules/video_filter/opencv_example.cpp
+3
-3
modules/video_filter/opencv_wrapper.c
modules/video_filter/opencv_wrapper.c
+2
-2
modules/video_filter/osdmenu.c
modules/video_filter/osdmenu.c
+1
-1
modules/video_output/omapfb.c
modules/video_output/omapfb.c
+2
-2
modules/video_output/x11/xvmc.c
modules/video_output/x11/xvmc.c
+1
-1
src/libvlc.c
src/libvlc.c
+1
-1
src/misc/filter_chain.c
src/misc/filter_chain.c
+1
-1
src/network/tcp.c
src/network/tcp.c
+1
-1
src/video_output/video_output.c
src/video_output/video_output.c
+1
-1
No files found.
modules/access/cdda/access.c
View file @
72fa5a9d
...
@@ -302,14 +302,14 @@ static block_t * CDDAReadBlocks( access_t * p_access )
...
@@ -302,14 +302,14 @@ static block_t * CDDAReadBlocks( access_t * p_access )
char
*
psz_mes
=
cdio_cddap_messages
(
p_cdda
->
paranoia_cd
);
char
*
psz_mes
=
cdio_cddap_messages
(
p_cdda
->
paranoia_cd
);
if
(
psz_mes
||
psz_err
)
if
(
psz_mes
||
psz_err
)
msg_Err
(
p_access
,
"%s%s
\n
"
,
psz_mes
?
psz_mes
:
""
,
msg_Err
(
p_access
,
"%s%s"
,
psz_mes
?
psz_mes
:
""
,
psz_err
?
psz_err
:
""
);
psz_err
?
psz_err
:
""
);
free
(
psz_err
);
free
(
psz_err
);
free
(
psz_mes
);
free
(
psz_mes
);
if
(
!
p_readbuf
)
if
(
!
p_readbuf
)
{
{
msg_Err
(
p_access
,
"paranoia read error on frame %i
\n
"
,
msg_Err
(
p_access
,
"paranoia read error on frame %i"
,
p_cdda
->
i_lsn
+
i
);
p_cdda
->
i_lsn
+
i
);
}
}
else
else
...
...
modules/access/dv.c
View file @
72fa5a9d
...
@@ -483,7 +483,7 @@ static int Raw1394GetNumPorts( access_t *p_access )
...
@@ -483,7 +483,7 @@ static int Raw1394GetNumPorts( access_t *p_access )
if
(
(
n_ports
=
raw1394_get_port_info
(
handle
,
pinf
,
16
)
)
<
0
)
if
(
(
n_ports
=
raw1394_get_port_info
(
handle
,
pinf
,
16
)
)
<
0
)
{
{
msg_Err
(
p_access
,
"raw1394 - failed to get port info: %m.
\n
"
);
msg_Err
(
p_access
,
"raw1394 - failed to get port info: %m."
);
raw1394_destroy_handle
(
handle
);
raw1394_destroy_handle
(
handle
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -573,7 +573,7 @@ static int DiscoverAVC( access_t *p_access, int* port, uint64_t guid )
...
@@ -573,7 +573,7 @@ static int DiscoverAVC( access_t *p_access, int* port, uint64_t guid )
/* select first AV/C Tape Reccorder Player node */
/* select first AV/C Tape Reccorder Player node */
if
(
rom1394_get_directory
(
handle
,
i
,
&
rom_dir
)
<
0
)
if
(
rom1394_get_directory
(
handle
,
i
,
&
rom_dir
)
<
0
)
{
{
msg_Err
(
p_access
,
"error reading config rom directory for node %d
\n
"
,
i
);
msg_Err
(
p_access
,
"error reading config rom directory for node %d"
,
i
);
continue
;
continue
;
}
}
if
(
(
rom1394_get_node_type
(
&
rom_dir
)
==
ROM1394_NODE_TYPE_AVC
)
&&
if
(
(
rom1394_get_node_type
(
&
rom_dir
)
==
ROM1394_NODE_TYPE_AVC
)
&&
...
...
modules/access/vcd/cdrom.c
View file @
72fa5a9d
...
@@ -728,7 +728,7 @@ int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev,
...
@@ -728,7 +728,7 @@ int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev,
}
}
if
(
sc
.
retsts
||
sc
.
error
)
if
(
sc
.
retsts
||
sc
.
error
)
{
{
msg_Err
(
p_this
,
"SCSI command failed: status %d error %d
\n
"
,
msg_Err
(
p_this
,
"SCSI command failed: status %d error %d"
,
sc
.
retsts
,
sc
.
error
);
sc
.
retsts
,
sc
.
error
);
if
(
i_type
==
VCD_TYPE
)
free
(
p_block
);
if
(
i_type
==
VCD_TYPE
)
free
(
p_block
);
return
-
1
;
return
-
1
;
...
...
modules/access/vcd/vcd.c
View file @
72fa5a9d
...
@@ -180,8 +180,8 @@ static int Open( vlc_object_t *p_this )
...
@@ -180,8 +180,8 @@ static int Open( vlc_object_t *p_this )
{
{
input_title_t
*
t
=
p_sys
->
title
[
i
]
=
vlc_input_title_New
();
input_title_t
*
t
=
p_sys
->
title
[
i
]
=
vlc_input_title_New
();
msg_Dbg
(
p_access
,
"title[%d] start=%d
\n
"
,
i
,
p_sys
->
p_sectors
[
1
+
i
]
);
msg_Dbg
(
p_access
,
"title[%d] start=%d"
,
i
,
p_sys
->
p_sectors
[
1
+
i
]
);
msg_Dbg
(
p_access
,
"title[%d] end=%d
\n
"
,
i
,
p_sys
->
p_sectors
[
i
+
2
]
);
msg_Dbg
(
p_access
,
"title[%d] end=%d"
,
i
,
p_sys
->
p_sectors
[
i
+
2
]
);
t
->
i_size
=
(
p_sys
->
p_sectors
[
i
+
2
]
-
p_sys
->
p_sectors
[
i
+
1
]
)
*
t
->
i_size
=
(
p_sys
->
p_sectors
[
i
+
2
]
-
p_sys
->
p_sectors
[
i
+
1
]
)
*
(
int64_t
)
VCD_DATA_SIZE
;
(
int64_t
)
VCD_DATA_SIZE
;
...
@@ -490,7 +490,7 @@ static int EntryPoints( access_t *p_access )
...
@@ -490,7 +490,7 @@ static int EntryPoints( access_t *p_access )
if
(
i_title
<
0
)
continue
;
/* Should not occur */
if
(
i_title
<
0
)
continue
;
/* Should not occur */
if
(
i_title
>=
p_sys
->
i_titles
)
continue
;
if
(
i_title
>=
p_sys
->
i_titles
)
continue
;
msg_Dbg
(
p_access
,
"Entry[%d] title=%d sector=%d
\n
"
,
msg_Dbg
(
p_access
,
"Entry[%d] title=%d sector=%d"
,
i
,
i_title
,
i_sector
);
i
,
i_title
,
i_sector
);
s
=
vlc_seekpoint_New
();
s
=
vlc_seekpoint_New
();
...
...
modules/audio_filter/spatializer/spatializer.cpp
View file @
72fa5a9d
...
@@ -131,7 +131,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -131,7 +131,7 @@ static int Open( vlc_object_t *p_this )
aout_filter_t
*
p_filter
=
(
aout_filter_t
*
)
p_this
;
aout_filter_t
*
p_filter
=
(
aout_filter_t
*
)
p_this
;
aout_filter_sys_t
*
p_sys
;
aout_filter_sys_t
*
p_sys
;
bool
b_fit
=
true
;
bool
b_fit
=
true
;
msg_Dbg
(
p_this
,
"Opening filter spatializer %s %s %d
\n
"
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"Opening filter spatializer %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
if
(
p_filter
->
input
.
i_format
!=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
||
if
(
p_filter
->
input
.
i_format
!=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
||
p_filter
->
output
.
i_format
!=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
)
p_filter
->
output
.
i_format
!=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
)
...
@@ -185,7 +185,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -185,7 +185,7 @@ static void Close( vlc_object_t *p_this )
delete
p_sys
->
p_reverbm
;
delete
p_sys
->
p_reverbm
;
vlc_mutex_destroy
(
&
p_sys
->
lock
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
free
(
p_sys
);
free
(
p_sys
);
msg_Dbg
(
p_this
,
"Closing filter spatializer %s %s %d
\n
"
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"Closing filter spatializer %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -280,7 +280,7 @@ static int RoomCallback( vlc_object_t *p_this, char const *psz_cmd,
...
@@ -280,7 +280,7 @@ static int RoomCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setroomsize
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setroomsize
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"room callback %3.1f %s %s %d
\n
"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"room callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -291,7 +291,7 @@ static int WidthCallback( vlc_object_t *p_this, char const *psz_cmd,
...
@@ -291,7 +291,7 @@ static int WidthCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setwidth
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setwidth
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"width callback %3.1f %s %s %d
\n
"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"width callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
WetCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
WetCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
...
@@ -301,7 +301,7 @@ static int WetCallback( vlc_object_t *p_this, char const *psz_cmd,
...
@@ -301,7 +301,7 @@ static int WetCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setwet
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setwet
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"wet callback %3.1f %s %s %d
\n
"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"wet callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
DryCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
DryCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
...
@@ -311,7 +311,7 @@ static int DryCallback( vlc_object_t *p_this, char const *psz_cmd,
...
@@ -311,7 +311,7 @@ static int DryCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setdry
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setdry
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"dry callback %3.1f %s %s %d
\n
"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"dry callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
DampCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
DampCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
...
@@ -321,7 +321,7 @@ static int DampCallback( vlc_object_t *p_this, char const *psz_cmd,
...
@@ -321,7 +321,7 @@ static int DampCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setdamp
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setdamp
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"damp callback %3.1f %s %s %d
\n
"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"damp callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
modules/codec/avcodec/encoder.c
View file @
72fa5a9d
...
@@ -245,7 +245,7 @@ int OpenEncoder( vlc_object_t *p_this )
...
@@ -245,7 +245,7 @@ int OpenEncoder( vlc_object_t *p_this )
msg_Err
(
p_enc
,
"cannot find encoder %s
\n
"
msg_Err
(
p_enc
,
"cannot find encoder %s
\n
"
"*** Your FFMPEG installation is crippled. ***
\n
"
"*** Your FFMPEG installation is crippled. ***
\n
"
"*** Please check with your FFMPEG packager. ***
\n
"
"*** Please check with your FFMPEG packager. ***
\n
"
"*** This is NOT a VLC media player issue. ***
\n
"
,
psz_namecodec
);
"*** This is NOT a VLC media player issue. ***"
,
psz_namecodec
);
intf_UserFatal
(
p_enc
,
false
,
_
(
"Streaming / Transcoding failed"
),
_
(
intf_UserFatal
(
p_enc
,
false
,
_
(
"Streaming / Transcoding failed"
),
_
(
/* I have had enough of all these MPEG-3 transcoding bug reports.
/* I have had enough of all these MPEG-3 transcoding bug reports.
...
...
modules/codec/dirac.c
View file @
72fa5a9d
...
@@ -800,7 +800,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
...
@@ -800,7 +800,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
p_sys
->
p_dirac
=
dirac_encoder_init
(
&
p_sys
->
ctx
,
0
);
p_sys
->
p_dirac
=
dirac_encoder_init
(
&
p_sys
->
ctx
,
0
);
if
(
!
p_sys
->
p_dirac
)
if
(
!
p_sys
->
p_dirac
)
{
{
msg_Err
(
p_enc
,
"Failed to initialize dirac encoder
\n
"
);
msg_Err
(
p_enc
,
"Failed to initialize dirac encoder"
);
p_enc
->
b_error
=
1
;
p_enc
->
b_error
=
1
;
return
NULL
;
return
NULL
;
}
}
...
...
modules/codec/kate.c
View file @
72fa5a9d
...
@@ -709,13 +709,13 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
...
@@ -709,13 +709,13 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
{
{
*
w
=
p_sys
->
ki
.
original_canvas_width
;
*
w
=
p_sys
->
ki
.
original_canvas_width
;
*
h
=
p_sys
->
ki
.
original_canvas_height
;
*
h
=
p_sys
->
ki
.
original_canvas_height
;
msg_Dbg
(
p_dec
,
"original canvas %zu %zu
\n
"
,
msg_Dbg
(
p_dec
,
"original canvas %zu %zu"
,
p_sys
->
ki
.
original_canvas_width
,
p_sys
->
ki
.
original_canvas_height
);
p_sys
->
ki
.
original_canvas_width
,
p_sys
->
ki
.
original_canvas_height
);
}
}
else
else
{
{
/* nothing, leave defaults */
/* nothing, leave defaults */
msg_Dbg
(
p_dec
,
"original canvas size unknown
\n
"
);
msg_Dbg
(
p_dec
,
"original canvas size unknown"
);
}
}
#else
#else
/* keep this just in case it might be allowed one day ;) */
/* keep this just in case it might be allowed one day ;) */
...
@@ -734,7 +734,7 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
...
@@ -734,7 +734,7 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
*
w
=
p_vout
->
fmt_in
.
i_width
;
*
w
=
p_vout
->
fmt_in
.
i_width
;
*
h
=
p_vout
->
fmt_in
.
i_height
;
*
h
=
p_vout
->
fmt_in
.
i_height
;
}
}
msg_Dbg
(
p_dec
,
"video: in %d %d, out %d %d, original canvas %zu %zu
\n
"
,
msg_Dbg
(
p_dec
,
"video: in %d %d, out %d %d, original canvas %zu %zu"
,
p_vout
->
fmt_in
.
i_width
,
p_vout
->
fmt_in
.
i_height
,
p_vout
->
fmt_in
.
i_width
,
p_vout
->
fmt_in
.
i_height
,
p_vout
->
fmt_out
.
i_width
,
p_vout
->
fmt_out
.
i_height
,
p_vout
->
fmt_out
.
i_width
,
p_vout
->
fmt_out
.
i_height
,
p_sys
->
ki
.
original_canvas_width
,
p_sys
->
ki
.
original_canvas_height
);
p_sys
->
ki
.
original_canvas_width
,
p_sys
->
ki
.
original_canvas_height
);
...
@@ -1110,7 +1110,7 @@ static int OnConfigurationChanged( decoder_t *p_dec, const char *psz_var,
...
@@ -1110,7 +1110,7 @@ static int OnConfigurationChanged( decoder_t *p_dec, const char *psz_var,
vlc_mutex_lock
(
&
p_sys
->
lock
);
vlc_mutex_lock
(
&
p_sys
->
lock
);
msg_Dbg
(
p_dec
,
"OnConfigurationChanged: %s
\n
"
,
psz_var
);
msg_Dbg
(
p_dec
,
"OnConfigurationChanged: %s"
,
psz_var
);
if
(
!
p_sys
->
b_use_tiger
||
!
p_sys
->
p_tr
)
if
(
!
p_sys
->
b_use_tiger
||
!
p_sys
->
p_tr
)
{
{
...
@@ -1366,7 +1366,7 @@ static subpicture_t *SetupSimpleKateSPU( decoder_t *p_dec, subpicture_t *p_spu,
...
@@ -1366,7 +1366,7 @@ static subpicture_t *SetupSimpleKateSPU( decoder_t *p_dec, subpicture_t *p_spu,
/* create the bitmap */
/* create the bitmap */
CreateKateBitmap
(
p_bitmap_region
->
p_picture
,
ev
->
bitmap
);
CreateKateBitmap
(
p_bitmap_region
->
p_picture
,
ev
->
bitmap
);
msg_Dbg
(
p_dec
,
"Created bitmap, %zux%zu, %zu colors
\n
"
,
ev
->
bitmap
->
width
,
ev
->
bitmap
->
height
,
ev
->
palette
->
ncolors
);
msg_Dbg
(
p_dec
,
"Created bitmap, %zux%zu, %zu colors"
,
ev
->
bitmap
->
width
,
ev
->
bitmap
->
height
,
ev
->
palette
->
ncolors
);
}
}
/* text region */
/* text region */
...
...
modules/codec/quicktime.c
View file @
72fa5a9d
...
@@ -746,17 +746,17 @@ static int OpenVideo( decoder_t *p_dec )
...
@@ -746,17 +746,17 @@ static int OpenVideo( decoder_t *p_dec )
memset
(
&
icap
,
0
,
sizeof
(
ImageSubCodecDecompressCapabilities
)
);
memset
(
&
icap
,
0
,
sizeof
(
ImageSubCodecDecompressCapabilities
)
);
cres
=
p_sys
->
ImageCodecInitialize
(
p_sys
->
ci
,
&
icap
);
cres
=
p_sys
->
ImageCodecInitialize
(
p_sys
->
ci
,
&
icap
);
msg_Dbg
(
p_dec
,
"ImageCodecInitialize->0x%X size=%d (%d)
\n
"
,
msg_Dbg
(
p_dec
,
"ImageCodecInitialize->0x%X size=%d (%d)"
,
(
int
)
cres
,
(
int
)
icap
.
recordSize
,
(
int
)
icap
.
decompressRecordSize
);
(
int
)
cres
,
(
int
)
icap
.
recordSize
,
(
int
)
icap
.
decompressRecordSize
);
memset
(
&
cinfo
,
0
,
sizeof
(
CodecInfo
)
);
memset
(
&
cinfo
,
0
,
sizeof
(
CodecInfo
)
);
cres
=
p_sys
->
ImageCodecGetCodecInfo
(
p_sys
->
ci
,
&
cinfo
);
cres
=
p_sys
->
ImageCodecGetCodecInfo
(
p_sys
->
ci
,
&
cinfo
);
msg_Dbg
(
p_dec
,
msg_Dbg
(
p_dec
,
"Flags: compr: 0x%x decomp: 0x%x format: 0x%x
\n
"
,
"Flags: compr: 0x%x decomp: 0x%x format: 0x%x"
,
(
unsigned
int
)
cinfo
.
compressFlags
,
(
unsigned
int
)
cinfo
.
compressFlags
,
(
unsigned
int
)
cinfo
.
decompressFlags
,
(
unsigned
int
)
cinfo
.
decompressFlags
,
(
unsigned
int
)
cinfo
.
formatFlags
);
(
unsigned
int
)
cinfo
.
formatFlags
);
msg_Dbg
(
p_dec
,
"quicktime_video: Codec name: %.*s
\n
"
,
msg_Dbg
(
p_dec
,
"quicktime_video: Codec name: %.*s"
,
((
unsigned
char
*
)
&
cinfo
.
typeName
)[
0
],
((
unsigned
char
*
)
&
cinfo
.
typeName
)[
0
],
((
unsigned
char
*
)
&
cinfo
.
typeName
)
+
1
);
((
unsigned
char
*
)
&
cinfo
.
typeName
)
+
1
);
...
@@ -822,7 +822,7 @@ static int OpenVideo( decoder_t *p_dec )
...
@@ -822,7 +822,7 @@ static int OpenVideo( decoder_t *p_dec )
p_sys
->
plane
,
p_sys
->
plane
,
p_dec
->
fmt_in
.
video
.
i_width
*
2
);
p_dec
->
fmt_in
.
video
.
i_width
*
2
);
msg_Dbg
(
p_dec
,
"NewGWorldFromPtr returned:%ld
\n
"
,
msg_Dbg
(
p_dec
,
"NewGWorldFromPtr returned:%ld"
,
65536
-
(
i_result
&
0xffff
)
);
65536
-
(
i_result
&
0xffff
)
);
memset
(
&
p_sys
->
decpar
,
0
,
sizeof
(
CodecDecompressParams
)
);
memset
(
&
p_sys
->
decpar
,
0
,
sizeof
(
CodecDecompressParams
)
);
...
@@ -840,7 +840,7 @@ static int OpenVideo( decoder_t *p_dec )
...
@@ -840,7 +840,7 @@ static int OpenVideo( decoder_t *p_dec )
p_sys
->
decpar
.
dstPixMap
=
**
p_sys
->
GetGWorldPixMap
(
p_sys
->
OutBufferGWorld
);
/*destPixmap; */
p_sys
->
decpar
.
dstPixMap
=
**
p_sys
->
GetGWorldPixMap
(
p_sys
->
OutBufferGWorld
);
/*destPixmap; */
cres
=
p_sys
->
ImageCodecPreDecompress
(
p_sys
->
ci
,
&
p_sys
->
decpar
);
cres
=
p_sys
->
ImageCodecPreDecompress
(
p_sys
->
ci
,
&
p_sys
->
decpar
);
msg_Dbg
(
p_dec
,
"quicktime_video: ImageCodecPreDecompress cres=0x%X
\n
"
,
msg_Dbg
(
p_dec
,
"quicktime_video: ImageCodecPreDecompress cres=0x%X"
,
(
int
)
cres
);
(
int
)
cres
);
es_format_Init
(
&
p_dec
->
fmt_out
,
VIDEO_ES
,
VLC_FOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
));
es_format_Init
(
&
p_dec
->
fmt_out
,
VIDEO_ES
,
VLC_FOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
));
...
@@ -937,7 +937,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
...
@@ -937,7 +937,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
if
(
cres
&
0xFFFF
)
if
(
cres
&
0xFFFF
)
{
{
msg_Dbg
(
p_dec
,
"quicktime_video: ImageCodecBandDecompress"
msg_Dbg
(
p_dec
,
"quicktime_video: ImageCodecBandDecompress"
" cres=0x%X (-0x%X) %d :(
\n
"
,
" cres=0x%X (-0x%X) %d :("
,
(
int
)
cres
,(
int
)
-
cres
,
(
int
)
cres
);
(
int
)
cres
,(
int
)
-
cres
,
(
int
)
cres
);
}
}
...
...
modules/control/dbus.c
View file @
72fa5a9d
...
@@ -195,7 +195,7 @@ DBUS_METHOD( PositionSet )
...
@@ -195,7 +195,7 @@ DBUS_METHOD( PositionSet )
if
(
dbus_error_is_set
(
&
error
)
)
if
(
dbus_error_is_set
(
&
error
)
)
{
{
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
@@ -243,7 +243,7 @@ DBUS_METHOD( VolumeSet )
...
@@ -243,7 +243,7 @@ DBUS_METHOD( VolumeSet )
if
(
dbus_error_is_set
(
&
error
)
)
if
(
dbus_error_is_set
(
&
error
)
)
{
{
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
@@ -392,7 +392,7 @@ DBUS_METHOD( AddTrack )
...
@@ -392,7 +392,7 @@ DBUS_METHOD( AddTrack )
if
(
dbus_error_is_set
(
&
error
)
)
if
(
dbus_error_is_set
(
&
error
)
)
{
{
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
@@ -443,7 +443,7 @@ DBUS_METHOD( GetMetadata )
...
@@ -443,7 +443,7 @@ DBUS_METHOD( GetMetadata )
{
{
PL_UNLOCK
;
PL_UNLOCK
;
pl_Release
(
(
vlc_object_t
*
)
p_this
);
pl_Release
(
(
vlc_object_t
*
)
p_this
);
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
@@ -488,7 +488,7 @@ DBUS_METHOD( DelTrack )
...
@@ -488,7 +488,7 @@ DBUS_METHOD( DelTrack )
if
(
dbus_error_is_set
(
&
error
)
)
if
(
dbus_error_is_set
(
&
error
)
)
{
{
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
@@ -525,7 +525,7 @@ DBUS_METHOD( SetLoop )
...
@@ -525,7 +525,7 @@ DBUS_METHOD( SetLoop )
if
(
dbus_error_is_set
(
&
error
)
)
if
(
dbus_error_is_set
(
&
error
)
)
{
{
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
@@ -556,7 +556,7 @@ DBUS_METHOD( Repeat )
...
@@ -556,7 +556,7 @@ DBUS_METHOD( Repeat )
if
(
dbus_error_is_set
(
&
error
)
)
if
(
dbus_error_is_set
(
&
error
)
)
{
{
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
@@ -588,7 +588,7 @@ DBUS_METHOD( SetRandom )
...
@@ -588,7 +588,7 @@ DBUS_METHOD( SetRandom )
if
(
dbus_error_is_set
(
&
error
)
)
if
(
dbus_error_is_set
(
&
error
)
)
{
{
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s
\n
"
,
msg_Err
(
(
vlc_object_t
*
)
p_this
,
"D-Bus message reading : %s"
,
error
.
message
);
error
.
message
);
dbus_error_free
(
&
error
);
dbus_error_free
(
&
error
);
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
return
DBUS_HANDLER_RESULT_NOT_YET_HANDLED
;
...
...
modules/gui/pda/pda_callbacks.c
View file @
72fa5a9d
...
@@ -490,7 +490,7 @@ void onFileListRow(GtkTreeView *treeview, GtkTreePath *path,
...
@@ -490,7 +490,7 @@ void onFileListRow(GtkTreeView *treeview, GtkTreePath *path,
p_model
=
gtk_tree_view_get_model
(
treeview
);
p_model
=
gtk_tree_view_get_model
(
treeview
);
if
(
!
p_model
)
if
(
!
p_model
)
{
{
msg_Err
(
p_intf
,
"PDA: Filelist model contains a NULL pointer
\n
"
);
msg_Err
(
p_intf
,
"PDA: Filelist model contains a NULL pointer"
);
return
;
return
;
}
}
if
(
!
gtk_tree_model_get_iter
(
p_model
,
&
iter
,
path
))
if
(
!
gtk_tree_model_get_iter
(
p_model
,
&
iter
,
path
))
...
@@ -785,7 +785,7 @@ void onPlaylistRow(GtkTreeView *treeview, GtkTreePath *path,
...
@@ -785,7 +785,7 @@ void onPlaylistRow(GtkTreeView *treeview, GtkTreePath *path,
p_model
=
gtk_tree_view_get_model
(
treeview
);
p_model
=
gtk_tree_view_get_model
(
treeview
);
if
(
!
p_model
)
if
(
!
p_model
)
{
{
msg_Err
(
p_intf
,
"PDA: Playlist model contains a NULL pointer
\n
"
);
msg_Err
(
p_intf
,
"PDA: Playlist model contains a NULL pointer"
);
return
;
return
;
}
}
if
(
!
gtk_tree_model_get_iter
(
p_model
,
&
iter
,
path
))
if
(
!
gtk_tree_model_get_iter
(
p_model
,
&
iter
,
path
))
...
...
modules/gui/qt4/components/extended_panels.cpp
View file @
72fa5a9d
...
@@ -251,7 +251,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
...
@@ -251,7 +251,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
module_t
*
p_obj
=
module_find
(
psz_name
);
module_t
*
p_obj
=
module_find
(
psz_name
);
if
(
!
p_obj
)
if
(
!
p_obj
)
{
{
msg_Err
(
p_intf
,
"Unable to find filter module
\"
%s
\
n
."
,
psz_name
);
msg_Err
(
p_intf
,
"Unable to find filter module
\"
%s
\
"
."
,
psz_name
);
return
;
return
;
}
}
...
...
modules/meta_engine/taglib.cpp
View file @
72fa5a9d
...
@@ -550,7 +550,7 @@ static int WriteMeta( vlc_object_t *p_this )
...
@@ -550,7 +550,7 @@ static int WriteMeta( vlc_object_t *p_this )
if
(
f
.
isNull
()
||
!
f
.
tag
()
||
f
.
file
()
->
readOnly
()
)
if
(
f
.
isNull
()
||
!
f
.
tag
()
||
f
.
file
()
->
readOnly
()
)
{
{
msg_Err
(
p_this
,
"File %s can't be opened for tag writing
\n
"
,
msg_Err
(
p_this
,
"File %s can't be opened for tag writing"
,
p_export
->
psz_file
);
p_export
->
psz_file
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
modules/misc/svg.c
View file @
72fa5a9d
...
@@ -415,14 +415,14 @@ static void svg_RenderPicture( filter_t *p_filter,
...
@@ -415,14 +415,14 @@ static void svg_RenderPicture( filter_t *p_filter,
(
guchar
*
)
p_svg
->
psz_text
,
strlen
(
p_svg
->
psz_text
),
(
guchar
*
)
p_svg
->
psz_text
,
strlen
(
p_svg
->
psz_text
),
&
error
)
)
&
error
)
)
{
{
msg_Err
(
p_filter
,
"error while rendering SVG: %s
\n
"
,
error
->
message
);
msg_Err
(
p_filter
,
"error while rendering SVG: %s"
,
error
->
message
);
g_object_unref
(
G_OBJECT
(
p_handle
)
);
g_object_unref
(
G_OBJECT
(
p_handle
)
);
return
;
return
;
}
}
if
(
!
rsvg_handle_close
(
p_handle
,
&
error
)
)
if
(
!
rsvg_handle_close
(
p_handle
,
&
error
)
)
{
{
msg_Err
(
p_filter
,
"error while rendering SVG (close): %s
\n
"
,
error
->
message
);
msg_Err
(
p_filter
,
"error while rendering SVG (close): %s"
,
error
->
message
);
g_object_unref
(
G_OBJECT
(
p_handle
)
);
g_object_unref
(
G_OBJECT
(
p_handle
)
);
return
;
return
;
}
}
...
...
modules/services_discovery/sap.c
View file @
72fa5a9d
...
@@ -1246,7 +1246,7 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp)
...
@@ -1246,7 +1246,7 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp)
||
((
p_sdp
->
orig_ip_version
!=
4
)
||
((
p_sdp
->
orig_ip_version
!=
4
)
&&
(
p_sdp
->
orig_ip_version
!=
6
)))
&&
(
p_sdp
->
orig_ip_version
!=
6
)))
{
{
msg_Dbg
(
p_obj
,
"SDP origin not supported: %s
\n
"
,
data
);
msg_Dbg
(
p_obj
,
"SDP origin not supported: %s"
,
data
);
/* Or maybe out-of-range, but this looks suspicious */
/* Or maybe out-of-range, but this looks suspicious */
return
NULL
;
return
NULL
;
}
}
...
...
modules/stream_out/mosaic_bridge.c
View file @
72fa5a9d
...
@@ -434,7 +434,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
...
@@ -434,7 +434,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/* Create user specified video filters */
/* Create user specified video filters */
psz_chain
=
var_GetNonEmptyString
(
p_stream
,
CFG_PREFIX
"vfilter"
);
psz_chain
=
var_GetNonEmptyString
(
p_stream
,
CFG_PREFIX
"vfilter"
);
msg_Dbg
(
p_stream
,
"psz_chain: %s
\n
"
,
psz_chain
);
msg_Dbg
(
p_stream
,
"psz_chain: %s"
,
psz_chain
);
if
(
psz_chain
)
if
(
psz_chain
)
{
{
p_sys
->
p_vf2
=
filter_chain_New
(
p_stream
,
"video filter2"
,
false
,
p_sys
->
p_vf2
=
filter_chain_New
(
p_stream
,
"video filter2"
,
false
,
...
...
modules/video_filter/chain.c
View file @
72fa5a9d
...
@@ -182,13 +182,13 @@ static int BuildChromaChain( filter_t *p_filter )
...
@@ -182,13 +182,13 @@ static int BuildChromaChain( filter_t *p_filter )
if
(
var_Create
(
p_filter
,
MODULE_STRING
"-level"
,
VLC_VAR_INTEGER
|
(
b_first
?
VLC_VAR_DOINHERIT
:
0
)
)
)
if
(
var_Create
(
p_filter
,
MODULE_STRING
"-level"
,
VLC_VAR_INTEGER
|
(
b_first
?
VLC_VAR_DOINHERIT
:
0
)
)
)
{
{
msg_Err
(
p_filter
,
"Failed to create %s variable
\n
"
,
psz_option
);
msg_Err
(
p_filter
,
"Failed to create %s variable"
,
psz_option
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
int
i_level
=
var_GetInteger
(
p_filter
,
psz_option
);
int
i_level
=
var_GetInteger
(
p_filter
,
psz_option
);
if
(
i_level
>=
CHAIN_LEVEL_MAX
)
if
(
i_level
>=
CHAIN_LEVEL_MAX
)
{
{
msg_Err
(
p_filter
,
"Too high level of recursion (%d)
\n
"
,
i_level
);
msg_Err
(
p_filter
,
"Too high level of recursion (%d)"
,
i_level
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
var_SetInteger
(
p_filter
,
psz_option
,
i_level
+
1
);
var_SetInteger
(
p_filter
,
psz_option
,
i_level
+
1
);
...
...
modules/video_filter/opencv_example.cpp
View file @
72fa5a9d
...
@@ -103,11 +103,11 @@ static int OpenFilter( vlc_object_t *p_this )
...
@@ -103,11 +103,11 @@ static int OpenFilter( vlc_object_t *p_this )
//create the VIDEO_FILTER_EVENT_VARIABLE
//create the VIDEO_FILTER_EVENT_VARIABLE
vlc_value_t
val
;
vlc_value_t
val
;
if
(
var_Create
(
p_filter
->
p_libvlc
,
VIDEO_FILTER_EVENT_VARIABLE
,
VLC_VAR_ADDRESS
|
VLC_VAR_DOINHERIT
)
!=
VLC_SUCCESS
)
if
(
var_Create
(
p_filter
->
p_libvlc
,
VIDEO_FILTER_EVENT_VARIABLE
,
VLC_VAR_ADDRESS
|
VLC_VAR_DOINHERIT
)
!=
VLC_SUCCESS
)
msg_Err
(
p_filter
,
"Could not create %s
\n
"
,
VIDEO_FILTER_EVENT_VARIABLE
);
msg_Err
(
p_filter
,
"Could not create %s"
,
VIDEO_FILTER_EVENT_VARIABLE
);
val
.
p_address
=
&
(
p_sys
->
event_info
);
val
.
p_address
=
&
(
p_sys
->
event_info
);
if
(
var_Set
(
p_filter
->
p_libvlc
,
VIDEO_FILTER_EVENT_VARIABLE
,
val
)
!=
VLC_SUCCESS
)
if
(
var_Set
(
p_filter
->
p_libvlc
,
VIDEO_FILTER_EVENT_VARIABLE
,
val
)
!=
VLC_SUCCESS
)
msg_Err
(
p_filter
,
"Could not set %s
\n
"
,
VIDEO_FILTER_EVENT_VARIABLE
);
msg_Err
(
p_filter
,
"Could not set %s"
,
VIDEO_FILTER_EVENT_VARIABLE
);
//OpenCV init specific to this example
//OpenCV init specific to this example
char
*
filename
=
config_GetPsz
(
p_filter
,
"opencv-haarcascade-file"
);
char
*
filename
=
config_GetPsz
(
p_filter
,
"opencv-haarcascade-file"
);
...
@@ -197,7 +197,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
...
@@ -197,7 +197,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
CvRect
*
r
;
CvRect
*
r
;
if
(
faces
&&
(
faces
->
total
>
0
))
if
(
faces
&&
(
faces
->
total
>
0
))
{
{
//msg_Dbg( p_filter, "Found %d face(s)
\n
", faces->total );
//msg_Dbg( p_filter, "Found %d face(s)", faces->total );
if
(
NULL
!=
p_filter
->
p_sys
->
event_info
.
p_region
)
if
(
NULL
!=
p_filter
->
p_sys
->
event_info
.
p_region
)
{
{
free
(
p_filter
->
p_sys
->
event_info
.
p_region
);
free
(
p_filter
->
p_sys
->
event_info
.
p_region
);
...
...
modules/video_filter/opencv_wrapper.c
View file @
72fa5a9d
...
@@ -533,7 +533,7 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in )
...
@@ -533,7 +533,7 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in )
finish
=
clock
();
finish
=
clock
();
duration
=
(
double
)(
finish
-
start
)
/
CLOCKS_PER_SEC
;
duration
=
(
double
)(
finish
-
start
)
/
CLOCKS_PER_SEC
;
if
(
p_sys
->
i_verbosity
>
VERB_WARN
)
if
(
p_sys
->
i_verbosity
>
VERB_WARN
)
msg_Dbg
(
p_vout
,
"VlcPictureToIplImageRgb took %2.4f seconds
\n
"
,
duration
);
msg_Dbg
(
p_vout
,
"VlcPictureToIplImageRgb took %2.4f seconds"
,
duration
);
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -586,7 +586,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -586,7 +586,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
finish
=
clock
();
finish
=
clock
();
duration
=
(
double
)(
finish
-
start
)
/
CLOCKS_PER_SEC
;
duration
=
(
double
)(
finish
-
start
)
/
CLOCKS_PER_SEC
;
if
(
p_vout
->
p_sys
->
i_verbosity
>
VERB_WARN
)
if
(
p_vout
->
p_sys
->
i_verbosity
>
VERB_WARN
)
msg_Dbg
(
p_vout
,
"Render took %2.4f seconds
\n
"
,
duration
);
msg_Dbg
(
p_vout
,
"Render took %2.4f seconds"
,
duration
);
ReleaseImages
(
p_vout
);
ReleaseImages
(
p_vout
);
p_outpic
->
date
=
p_pic
->
date
;
p_outpic
->
date
=
p_pic
->
date
;
...
...
modules/video_filter/osdmenu.c
View file @
72fa5a9d
...
@@ -707,7 +707,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
...
@@ -707,7 +707,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
osd_ButtonSelect
(
p_this
,
p_button
);
osd_ButtonSelect
(
p_this
,
p_button
);
p_sys
->
b_update
=
p_sys
->
b_visible
?
true
:
false
;
p_sys
->
b_update
=
p_sys
->
b_visible
?
true
:
false
;
p_sys
->
b_clicked
=
true
;
p_sys
->
b_clicked
=
true
;
msg_Dbg
(
p_this
,
"mouse clicked %s (%d,%d)
\n
"
,
p_button
->
psz_name
,
i_x
,
i_y
);
msg_Dbg
(
p_this
,
"mouse clicked %s (%d,%d)"
,
p_button
->
psz_name
,
i_x
,
i_y
);
}
}
}
}
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
modules/video_output/omapfb.c
View file @
72fa5a9d
...
@@ -598,7 +598,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
...
@@ -598,7 +598,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
if
(
(
p_sys
->
p_video
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
if
(
(
p_sys
->
p_video
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
p_sys
->
i_fd
,
0
))
==
MAP_FAILED
)
p_sys
->
i_fd
,
0
))
==
MAP_FAILED
)
{
{
msg_Err
(
p_vout
,
"Can't mmap: %s
\n
"
,
strerror
(
errno
)
);
msg_Err
(
p_vout
,
"Can't mmap: %s"
,
strerror
(
errno
)
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -615,7 +615,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
...
@@ -615,7 +615,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
if
(
(
p_sys
->
p_null
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
if
(
(
p_sys
->
p_null
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
MAP_PRIVATE
,
p_sys
->
i_null_fd
,
0
))
==
MAP_FAILED
)
MAP_PRIVATE
,
p_sys
->
i_null_fd
,
0
))
==
MAP_FAILED
)
{
{
msg_Err
(
p_vout
,
"Can't mmap 2: %s
\n
"
,
strerror
(
errno
)
);
msg_Err
(
p_vout
,
"Can't mmap 2: %s"
,
strerror
(
errno
)
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
modules/video_output/x11/xvmc.c
View file @
72fa5a9d
...
@@ -545,7 +545,7 @@ XvMCSubpicture *xxmc_xvmc_alloc_subpicture( vout_thread_t *p_vout,
...
@@ -545,7 +545,7 @@ XvMCSubpicture *xxmc_xvmc_alloc_subpicture( vout_thread_t *p_vout,
return
NULL
;
return
NULL
;
}
}
XVMCUNLOCKDISPLAY
(
p_vout
->
p_sys
->
p_display
);
XVMCUNLOCKDISPLAY
(
p_vout
->
p_sys
->
p_display
);
msg_Dbg
(
p_vout
,
"video_out_xxmc: created subpicture %d
\n
"
,
i
);
msg_Dbg
(
p_vout
,
"video_out_xxmc: created subpicture %d"
,
i
);
handler
->
subInUse
[
i
]
=
1
;
handler
->
subInUse
[
i
]
=
1
;
handler
->
subValid
[
i
]
=
1
;
handler
->
subValid
[
i
]
=
1
;
pthread_mutex_unlock
(
&
handler
->
mutex
);
pthread_mutex_unlock
(
&
handler
->
mutex
);
...
...
src/libvlc.c
View file @
72fa5a9d
...
@@ -718,7 +718,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
...
@@ -718,7 +718,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
msg_Err
(
p_libvlc
,
"verbose-objects usage:
\n
"
msg_Err
(
p_libvlc
,
"verbose-objects usage:
\n
"
"--verbose-objects=+printthatobject,"
"--verbose-objects=+printthatobject,"
"-dontprintthatone
\n
"
"-dontprintthatone
\n
"
"(keyword 'all' to applies to all objects)
\n
"
);
"(keyword 'all' to applies to all objects)"
);
free
(
psz_verbose_objects
);
free
(
psz_verbose_objects
);
/* FIXME: leaks!!!! */
/* FIXME: leaks!!!! */
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
...
src/misc/filter_chain.c
View file @
72fa5a9d
...
@@ -458,7 +458,7 @@ static picture_t *VideoBufferNew( filter_t *p_filter )
...
@@ -458,7 +458,7 @@ static picture_t *VideoBufferNew( filter_t *p_filter )
p_fmt
->
i_width
,
p_fmt
->
i_height
,
p_fmt
->
i_width
,
p_fmt
->
i_height
,
p_fmt
->
i_aspect
);
p_fmt
->
i_aspect
);
if
(
!
p_picture
)
if
(
!
p_picture
)
msg_Err
(
p_filter
,
"Failed to allocate picture
\n
"
);
msg_Err
(
p_filter
,
"Failed to allocate picture"
);
return
p_picture
;
return
p_picture
;
}
}
static
void
VideoBufferDelete
(
filter_t
*
p_filter
,
picture_t
*
p_picture
)
static
void
VideoBufferDelete
(
filter_t
*
p_filter
,
picture_t
*
p_picture
)
...
...
src/network/tcp.c
View file @
72fa5a9d
...
@@ -511,7 +511,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
...
@@ -511,7 +511,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
if
(
buffer
[
1
]
!=
0x00
)
if
(
buffer
[
1
]
!=
0x00
)
{
{
msg_Err
(
p_obj
,
"socks: CONNECT request failed
\n
"
);
msg_Err
(
p_obj
,
"socks: CONNECT request failed"
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
src/video_output/video_output.c
View file @
72fa5a9d
...
@@ -1332,7 +1332,7 @@ static void* RunThread( void *p_this )
...
@@ -1332,7 +1332,7 @@ static void* RunThread( void *p_this )
p_vout
->
b_error
=
InitThread
(
p_vout
);
p_vout
->
b_error
=
InitThread
(
p_vout
);
if
(
p_vout
->
b_error
)
if
(
p_vout
->
b_error
)
msg_Err
(
p_vout
,
"InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed
\n
"
);
msg_Err
(
p_vout
,
"InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed"
);
vlc_cond_signal
(
&
p_vout
->
p
->
picture_wait
);
vlc_cond_signal
(
&
p_vout
->
p
->
picture_wait
);
vlc_mutex_unlock
(
&
p_vout
->
picture_lock
);
vlc_mutex_unlock
(
&
p_vout
->
picture_lock
);
...
...
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