[SCM] libdvdnav/master: Remove 0001-dvdnav_get_position.patch, fixed in upstream
bob.dybian-guest at users.alioth.debian.org
bob.dybian-guest at users.alioth.debian.org
Fri Jul 24 16:24:56 UTC 2015
The following commit has been merged in the master branch:
commit 245dd742908baf0c6b58837be8e101d0cd148c52
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date: Fri Jul 24 17:53:09 2015 +0200
Remove 0001-dvdnav_get_position.patch, fixed in upstream
diff --git a/debian/patches/0001-dvdnav_get_position.patch b/debian/patches/0001-dvdnav_get_position.patch
deleted file mode 100644
index 8c3885d..0000000
--- a/debian/patches/0001-dvdnav_get_position.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Sun, 31 Aug 2014 00:51:40 +0200
-Subject: dvdnav_get_position
-
-Return an error in dvdnav_get_position instead of asserting.
-
-Closes: #763279
-LP: #1236939
----
- src/searching.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/searching.c b/src/searching.c
-index f6e497e..74a16ee 100644
---- a/src/searching.c
-+++ b/src/searching.c
-@@ -563,7 +563,8 @@ dvdnav_status_t dvdnav_get_position(dvdnav_t *this, uint32_t *pos,
- *len += cell->last_sector - cell->first_sector + 1;
- }
-
-- assert((signed)*pos != -1);
-+ if((signed)*pos == -1)
-+ return DVDNAV_STATUS_ERR;
-
- pthread_mutex_unlock(&this->vm_lock);
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 761cde7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-dvdnav_get_position.patch
--
libdvdnav packaging
More information about the pkg-multimedia-commits
mailing list