diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 12:04:09 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 12:04:09 -0300 |
| commit | bae3e33d2e446a83c2a1ec40e017a9378fe10ef0 (patch) | |
| tree | 7ca1b9e71febdb445097556529442c74e59b3746 /extra/libdvdnav | |
| parent | 5a9eef758e9537d6f9913ed487686e8021a77808 (diff) | |
| parent | 8736f458a17a03cf79a763a0c8122f93162fed71 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dev86/PKGBUILD
community/diacanvas/PKGBUILD
community/gnunet-setup/PKGBUILD
community/hula/PKGBUILD
extra/libgnomecups/PKGBUILD
extra/libgnomeprint/PKGBUILD
extra/libgnomeprintui/PKGBUILD
extra/libmcs/PKGBUILD
extra/lv2core/PKGBUILD
extra/opencdk/PKGBUILD
Diffstat (limited to 'extra/libdvdnav')
| -rw-r--r-- | extra/libdvdnav/deadlock.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/extra/libdvdnav/deadlock.patch b/extra/libdvdnav/deadlock.patch deleted file mode 100644 index f00433e67..000000000 --- a/extra/libdvdnav/deadlock.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/dvdnav.c 2009-11-08 16:58:25.000000000 +0300 -+++ b/src/dvdnav.c 2009-11-08 16:58:52.000000000 +0300 -@@ -180,12 +180,13 @@ - pthread_mutex_unlock(&this->vm_lock); - return DVDNAV_STATUS_ERR; - } -+ pthread_mutex_unlock(&this->vm_lock); -+ - #ifdef LOG_DEBUG - fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n"); - #endif - result = dvdnav_clear(this); - -- pthread_mutex_unlock(&this->vm_lock); - return result; - } - |