summaryrefslogtreecommitdiff
path: root/xine/BluRay/input_bluray.c
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-11-27 20:26:44 +0000
committerphintuka <phintuka>2009-11-27 20:26:44 +0000
commit2c0cc971a3ba6a8eeb384a4865587a45ed835480 (patch)
treefb062f24ab21bc49352526c8493fbe907ced4dc4 /xine/BluRay/input_bluray.c
parentd8f84e2f49b5808334448e2b42c0612154aa37df (diff)
downloadxineliboutput-2c0cc971a3ba6a8eeb384a4865587a45ed835480.tar.gz
xineliboutput-2c0cc971a3ba6a8eeb384a4865587a45ed835480.tar.bz2
Updated for libbluray SVN rev 103
Diffstat (limited to 'xine/BluRay/input_bluray.c')
-rw-r--r--xine/BluRay/input_bluray.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/xine/BluRay/input_bluray.c b/xine/BluRay/input_bluray.c
index 1e1b329a..20ee5073 100644
--- a/xine/BluRay/input_bluray.c
+++ b/xine/BluRay/input_bluray.c
@@ -22,7 +22,7 @@
* Input plugin for BluRay discs / images
*
* Requires libbluray from http://www.assembla.com/spaces/libbluray/
- * Tested with revision 97
+ * Tested with SVN revision 103
*
*/
@@ -204,9 +204,10 @@ static off_t bluray_plugin_seek (input_plugin_t *this_gen, off_t offset, int ori
/* clip seek point to nearest random access point */
if (this->nav_title) {
- uint32_t in_pkt = offset / 192;
- uint32_t out_pkt = in_pkt;
- nav_packet_search(this->nav_title, in_pkt, &out_pkt);
+ uint32_t in_pkt = offset / 192;
+ uint32_t out_pkt = in_pkt;
+ uint32_t out_time = 0;
+ nav_packet_search(this->nav_title, in_pkt, &out_pkt, &out_time);
lprintf("bluray_plugin_seek() seeking to %"PRId64" (packet %d)\n", offset, in_pkt);
offset = (off_t)192 * (off_t)out_pkt;
lprintf("Nearest random access point at %"PRId64" (packet %d)\n", offset, out_pkt);
@@ -273,7 +274,7 @@ static int bluray_plugin_get_optional_data (input_plugin_t *this_gen, void *data
*/
case INPUT_OPTIONAL_DATA_AUDIOLANG:
if (this->nav_title) {
- CLPI_PROG *prog = &this->nav_title->clip->cl->program.progs[0];
+ CLPI_PROG *prog = &this->nav_title->clip_list.clip->cl->program.progs[0];
int i, n = 0;
for (i=0 ; i < prog->num_streams; i++)
if (prog->streams[i].pid >= 0x1100 && prog->streams[i].pid < 0x1200) {
@@ -297,7 +298,7 @@ static int bluray_plugin_get_optional_data (input_plugin_t *this_gen, void *data
*/
case INPUT_OPTIONAL_DATA_SPULANG:
if (this->nav_title) {
- CLPI_PROG *prog = &this->nav_title->clip->cl->program.progs[0];
+ CLPI_PROG *prog = &this->nav_title->clip_list.clip->cl->program.progs[0];
int i, n = 0;
for (i=0 ; i < prog->num_streams; i++)
if (prog->streams[i].pid >= 0x1200 && prog->streams[i].pid < 0x1300 &&