aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorArne Morten Kvarving <cptspiff@gmail.com>2014-04-22 16:46:04 +0200
committerace20022 <ace20022@ymail.com>2015-03-01 23:05:01 +0100
commit828b42ec8ebf8f14f9db6e5f3ccf1fdf7f94efff (patch)
treea0ba0a548845ac12406f8f3d317302edd839e572 /lib
parent1e987d235c72192336623dc206e75407724b3d98 (diff)
added: support grabbing chapter name and position from bluray/dvds
Diffstat (limited to 'lib')
-rw-r--r--lib/libdvd/libdvdnav/src/dvdnav.c5
-rw-r--r--lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h1
-rw-r--r--lib/libdvd/patches/libdvdnav.diff15
3 files changed, 21 insertions, 0 deletions
diff --git a/lib/libdvd/libdvdnav/src/dvdnav.c b/lib/libdvd/libdvdnav/src/dvdnav.c
index 7b2ff892a4..b261b3e359 100644
--- a/lib/libdvd/libdvdnav/src/dvdnav.c
+++ b/lib/libdvd/libdvdnav/src/dvdnav.c
@@ -1230,6 +1230,11 @@ int dvdnav_get_button_info(dvdnav_t* this, int alpha[2][4], int color[2][4])
return 0;
}
+void dvdnav_free(void* pdata)
+{
+ free(pdata);
+}
+
#undef printerr
#define printerr(str) strncpy(self->err_str, str, MAX_ERR_LEN);
diff --git a/lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h b/lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h
index bf6aae9d2a..8b9d75ea2b 100644
--- a/lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h
+++ b/lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h
@@ -697,6 +697,7 @@ int8_t dvdnav_is_domain_vtsm(dvdnav_t *self);
*/
int8_t dvdnav_is_domain_vts(dvdnav_t *self);
+void dvdnav_free(void* pdata);
#ifdef __cplusplus
}
diff --git a/lib/libdvd/patches/libdvdnav.diff b/lib/libdvd/patches/libdvdnav.diff
index cb702a4b38..42bad876b0 100644
--- a/lib/libdvd/patches/libdvdnav.diff
+++ b/lib/libdvd/patches/libdvdnav.diff
@@ -149,6 +149,16 @@ diff -uwr ../libdvdnav-4.2.1/src/dvdnav/dvdnav.h lib/libdvd/libdvdnav/src/dvdnav
/*
* Stop playing the current position and start playback of the title
+ * from the specified timecode.
+ *
+@@ -695,6 +697,7 @@
+ */
+ int8_t dvdnav_is_domain_vts(dvdnav_t *self);
+
++void dvdnav_free(void* pdata);
+
+ #ifdef __cplusplus
+ }
diff -uwr ../libdvdnav-4.2.1/src/dvdnav.c lib/libdvd/libdvdnav/src/dvdnav.c
--- ../libdvdnav-4.2.1/src/dvdnav.c Thu Oct 3 23:39:38 2013
+++ lib/libdvd/libdvdnav/src/dvdnav.c Fri Feb 7 19:24:42 2014
@@ -284,6 +294,11 @@ diff -uwr ../libdvdnav-4.2.1/src/dvdnav.c lib/libdvd/libdvdnav/src/dvdnav.c
+ return 0;
+}
+
++void dvdnav_free(void* pdata)
++{
++ free(pdata);
++}
++
+#undef printerr
+#define printerr(str) strncpy(self->err_str, str, MAX_ERR_LEN);
+