Changeset 82abb3013a56507f3431eab49480d53376e5965f
- Timestamp:
- 05/15/08 22:55:01
(2 months ago)
- Author:
- Pierre d'Herbemont <pdherbemont@videolan.org>
- git-committer:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1210884901 +0200
- git-parent:
[42255fd0692bc9d4b4155728c1f390301a9f19e6]
- git-author:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1210884901 +0200
- Message:
Revert "vlc: Make sure we call libvlc_release() when we are requested to die."
This reverts commit 68bcb6a4322b55b70c231a597d7b45a5406fd7f8.
As pointed by courmisch, this is crashy.
Conflicts:
src/vlc.c
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r42255fd |
r82abb30 |
|
| 56 | 56 | static void *SigHandler (void *set); |
|---|
| 57 | 57 | #endif |
|---|
| 58 | | |
|---|
| 59 | | /* running vlc instance */ |
|---|
| 60 | | static libvlc_instance_t * vlc = NULL; |
|---|
| 61 | 58 | |
|---|
| 62 | 59 | /***************************************************************************** |
|---|
| … | … | |
| 188 | 185 | |
|---|
| 189 | 186 | /* Initialize libvlc */ |
|---|
| 190 | | vlc = libvlc_new (i_argc, ppsz_argv, &ex); |
|---|
| | 187 | libvlc_instance_t *vlc = libvlc_new (i_argc, ppsz_argv, &ex); |
|---|
| 191 | 188 | if (vlc != NULL) |
|---|
| 192 | 189 | { |
|---|
| … | … | |
| 256 | 253 | fprintf (stderr, "signal %d received, terminating vlc - do it " |
|---|
| 257 | 254 | "again quickly in case it gets stuck\n", i_signal); |
|---|
| 258 | | if (vlc) libvlc_release (vlc); |
|---|
| | 255 | //VLC_Die( 0 ); |
|---|
| 259 | 256 | } |
|---|
| 260 | 257 | else /* time (NULL) <= abort_time */ |
|---|