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
c15a5164
Commit
c15a5164
authored
Jun 04, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ignore exceptions correctly - don't let libvlc assert
parent
ed2a403f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
src/vlc.c
src/vlc.c
+5
-3
src/winvlc.c
src/winvlc.c
+4
-2
No files found.
src/vlc.c
View file @
c15a5164
...
...
@@ -115,8 +115,9 @@ int main( int i_argc, const char *ppsz_argv[] )
if
((
ppsz_argv
[
i
]
=
FromLocale
(
ppsz_argv
[
i
]))
==
NULL
)
return
1
;
// BOOM!
libvlc_exception_t
ex
;
libvlc_exception_t
ex
,
dummy
;
libvlc_exception_init
(
&
ex
);
libvlc_exception_init
(
&
dummy
);
/* Initialize libvlc */
int
i_argc_real
=
i_argc
?
i_argc
-
1
:
0
;
...
...
@@ -125,9 +126,9 @@ int main( int i_argc, const char *ppsz_argv[] )
if
(
vlc
!=
NULL
)
{
libvlc_add_intf
(
vlc
,
"signals"
,
NULL
);
libvlc_add_intf
(
vlc
,
"signals"
,
&
dummy
);
libvlc_add_intf
(
vlc
,
NULL
,
&
ex
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
NULL
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
&
dummy
);
libvlc_wait
(
vlc
);
libvlc_release
(
vlc
);
}
...
...
@@ -136,6 +137,7 @@ int main( int i_argc, const char *ppsz_argv[] )
fprintf
(
stderr
,
"%s
\n
"
,
libvlc_exception_get_message
(
&
ex
));
libvlc_exception_clear
(
&
ex
);
libvlc_exception_clear
(
&
dummy
);
for
(
int
i
=
0
;
i
<
i_argc
;
i
++
)
LocaleFree
(
ppsz_argv
[
i
]);
...
...
src/winvlc.c
View file @
c15a5164
...
...
@@ -103,15 +103,16 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
argc
=
parse_cmdline
(
psz_cmdline
,
&
argv
);
libvlc_exception_t
ex
;
libvlc_exception_t
ex
,
dummy
;
libvlc_exception_init
(
&
ex
);
libvlc_exception_init
(
&
dummy
);
/* Initialize libvlc */
libvlc_instance_t
*
vlc
=
libvlc_new
(
argc
,
(
const
char
**
)
argv
,
&
ex
);
if
(
vlc
!=
NULL
)
{
libvlc_add_intf
(
vlc
,
NULL
,
&
ex
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
NULL
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
&
dummy
);
libvlc_wait
(
vlc
);
libvlc_release
(
vlc
);
}
...
...
@@ -119,6 +120,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
ret
=
libvlc_exception_raised
(
&
ex
);
libvlc_exception_clear
(
&
ex
);
libvlc_exception_clear
(
&
dummy
);
return
ret
;
}
...
...
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