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
c5c06b64
Commit
c5c06b64
authored
May 26, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.0-bugfix'
Conflicts: src/input/input.c
parents
ca07b0f9
622c64a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
modules/misc/logger.c
modules/misc/logger.c
+3
-4
src/input/input.c
src/input/input.c
+0
-1
No files found.
modules/misc/logger.c
View file @
c5c06b64
...
...
@@ -348,11 +348,10 @@ static void SyslogPrint( const msg_item_t *p_msg )
int
i_priority
=
i_prio
[
p_msg
->
i_type
];
if
(
p_msg
->
psz_header
)
syslog
(
i_priority
,
"%s%s %s: %s"
,
p_msg
->
psz_header
,
ppsz_type
[
p_msg
->
i_type
],
p_msg
->
psz_module
,
p_msg
->
psz_msg
);
syslog
(
i_priority
,
"%s %s%s%s"
,
p_msg
->
psz_header
,
p_msg
->
psz_module
,
ppsz_type
[
p_msg
->
i_type
],
p_msg
->
psz_msg
);
else
syslog
(
i_priority
,
"%s%s
:
%s"
,
p_msg
->
psz_module
,
syslog
(
i_priority
,
"%s%s%s"
,
p_msg
->
psz_module
,
ppsz_type
[
p_msg
->
i_type
],
p_msg
->
psz_msg
);
}
...
...
src/input/input.c
View file @
c5c06b64
...
...
@@ -1138,7 +1138,6 @@ static void InitPrograms( input_thread_t * p_input )
{
demux_Control
(
p_input
->
p
->
input
.
p_demux
,
DEMUX_SET_GROUP
,
-
1
,
val
.
p_list
);
var_FreeList
(
&
val
,
NULL
);
}
else
{
...
...
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