Tomáš Chvátal 2017-02-02 13:16:57 +00:00 committed by Git OBS Bridge
parent fb14fbe1d3
commit cf955ad378

View File

@ -6,22 +6,22 @@ X-Git-Url: http://git.videolan.org/?p=libbluray.git;a=commitdiff_plain;h=da50ad6
expose clip_id in BLURAY_CLIP_INFO
---
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index fdaadc5..c515019 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -2672,6 +2672,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx,
BLURAY_CLIP_INFO *ci = &title_info->clips[ii];
NAV_CLIP *nc = &title->clip_list.clip[ii];
Index: libbluray-0.9.3/src/libbluray/bluray.c
===================================================================
--- libbluray-0.9.3.orig/src/libbluray/bluray.c
+++ libbluray-0.9.3/src/libbluray/bluray.c
@@ -2602,6 +2602,7 @@ static BLURAY_TITLE_INFO* _fill_title_in
BLURAY_CLIP_INFO *ci = &title_info->clips[ii];
NAV_CLIP *nc = &title->clip_list.clip[ii];
+ memcpy(ci->clip_id, pi->clip->clip_id, sizeof(ci->clip_id));
ci->pkt_count = nc->end_pkt - nc->start_pkt;
ci->start_time = (uint64_t)nc->title_time * 2;
ci->in_time = (uint64_t)pi->in_time * 2;
diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
index 997f59d..725292e 100644
--- a/src/libbluray/bluray.h
+++ b/src/libbluray/bluray.h
+ memcpy(ci->clip_id, pi->clip->clip_id, sizeof(ci->clip_id));
ci->pkt_count = nc->end_pkt - nc->start_pkt;
ci->start_time = (uint64_t)nc->title_time * 2;
ci->in_time = (uint64_t)pi->in_time * 2;
Index: libbluray-0.9.3/src/libbluray/bluray.h
===================================================================
--- libbluray-0.9.3.orig/src/libbluray/bluray.h
+++ libbluray-0.9.3/src/libbluray/bluray.h
@@ -244,6 +244,7 @@ typedef struct bd_clip {
uint64_t start_time; /* start media time, 90kHz, ("playlist time") */
uint64_t in_time; /* start timestamp, 90kHz */