libbluray | branch: master | hpi1 <[email protected]> | Wed Jul 2 14:29:40 2014 +0300| [0c2bd257038c6dc34069e1668c8595074f9f63d1] | committer: hpi1
nav_chapter_get_current(): rename parameter "pkt" to "clip_pkt" > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=0c2bd257038c6dc34069e1668c8595074f9f63d1 --- src/libbluray/bdnav/navigation.c | 6 +++--- src/libbluray/bdnav/navigation.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c index 69981af..22edd85 100644 --- a/src/libbluray/bdnav/navigation.c +++ b/src/libbluray/bdnav/navigation.c @@ -578,7 +578,7 @@ NAV_CLIP* nav_chapter_search(NAV_TITLE *title, unsigned chapter, uint32_t *clip_ return clip; } -uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t pkt) +uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t clip_pkt) { NAV_MARK * mark; NAV_TITLE *title; @@ -598,12 +598,12 @@ uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t pkt) else return 0; } - if (mark->clip_ref == clip->ref && mark->clip_pkt <= pkt) { + if (mark->clip_ref == clip->ref && mark->clip_pkt <= clip_pkt) { if ( ii == title->chap_list.count - 1 ) { return ii; } mark = &title->chap_list.mark[ii+1]; - if (mark->clip_ref != clip->ref || mark->clip_pkt > pkt) { + if (mark->clip_ref != clip->ref || mark->clip_pkt > clip_pkt) { return ii; } } diff --git a/src/libbluray/bdnav/navigation.h b/src/libbluray/bdnav/navigation.h index 3813145..9cc1032 100644 --- a/src/libbluray/bdnav/navigation.h +++ b/src/libbluray/bdnav/navigation.h @@ -146,7 +146,7 @@ BD_PRIVATE NAV_CLIP* nav_packet_search(NAV_TITLE *title, uint32_t pkt, uint32_t BD_PRIVATE NAV_CLIP* nav_time_search(NAV_TITLE *title, uint32_t tick, uint32_t *clip_pkt, uint32_t *out_pkt); BD_PRIVATE void nav_clip_time_search(NAV_CLIP *clip, uint32_t tick, uint32_t *clip_pkt, uint32_t *out_pkt); BD_PRIVATE NAV_CLIP* nav_chapter_search(NAV_TITLE *title, unsigned chapter, uint32_t *clip_pkt, uint32_t *out_pkt); -BD_PRIVATE uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t pkt); +BD_PRIVATE uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t clip_pkt); BD_PRIVATE NAV_CLIP* nav_mark_search(NAV_TITLE *title, unsigned mark, uint32_t *clip_pkt, uint32_t *out_pkt); BD_PRIVATE uint32_t nav_angle_change_search(NAV_CLIP *clip, uint32_t pkt, uint32_t *time); BD_PRIVATE NAV_CLIP* nav_set_angle(NAV_TITLE *title, NAV_CLIP *clip, unsigned angle); _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
