[libbluray-devel] navigation: remove duplicate code
hpi1
git at videolan.org
Fri Jun 3 10:03:29 CEST 2016
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Wed Jun 1 12:03:51 2016 +0300| [042930bd6ff8707449ad439dee587c5596ebefa1] | committer: hpi1
navigation: remove duplicate code
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=042930bd6ff8707449ad439dee587c5596ebefa1
---
src/libbluray/bdnav/navigation.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
index 1ffb090..c9e03c7 100644
--- a/src/libbluray/bdnav/navigation.c
+++ b/src/libbluray/bdnav/navigation.c
@@ -878,15 +878,7 @@ NAV_CLIP* nav_time_search(NAV_TITLE *title, uint32_t tick, uint32_t *clip_pkt, u
*clip_pkt = clip->end_pkt;
} else {
clip = &title->clip_list.clip[ii];
- if (clip->cl != NULL) {
- *clip_pkt = clpi_lookup_spn(clip->cl, tick - pos + pi->in_time, 1,
- title->pl->play_item[clip->ref].clip[clip->angle].stc_id);
- if (*clip_pkt < clip->start_pkt) {
- *clip_pkt = clip->start_pkt;
- }
- } else {
- *clip_pkt = clip->start_pkt;
- }
+ nav_clip_time_search(clip, tick - pos + pi->in_time, clip_pkt, out_pkt);
}
*out_pkt = clip->title_pkt + *clip_pkt - clip->start_pkt;
return clip;
More information about the libbluray-devel
mailing list