libbluray | branch: master | hpi1 <[email protected]> | Thu Jun 1 11:14:11 2017 +0300| [2be6410b79bcc1a9bfa6c8e87997eccda011ea13] | committer: hpi1
Cosmetics > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=2be6410b79bcc1a9bfa6c8e87997eccda011ea13 --- src/libbluray/bluray.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c index 5ae0d09c..4b50ff2c 100644 --- a/src/libbluray/bluray.c +++ b/src/libbluray/bluray.c @@ -897,13 +897,10 @@ static int _run_gc(BLURAY *bd, gc_ctrl_e msg, uint32_t param) * disc info */ -const BLURAY_DISC_INFO *bd_get_disc_info(BLURAY *bd) -{ - return &bd->disc_info; -} - static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *enc_info) { + INDX_ROOT *index = NULL; + if (enc_info) { bd->disc_info.aacs_detected = enc_info->aacs_detected; bd->disc_info.libaacs_detected = enc_info->libaacs_detected; @@ -951,9 +948,9 @@ static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *enc_info) return; } - bd->disc_info.udf_volume_id = disc_volume_id(bd->disc); + bd->disc_info.udf_volume_id = disc_volume_id(bd->disc); + index = indx_get(bd->disc); - INDX_ROOT *index = indx_get(bd->disc); if (index) { INDX_PLAY_ITEM *pi; unsigned ii; @@ -1077,6 +1074,11 @@ static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *enc_info) } } +const BLURAY_DISC_INFO *bd_get_disc_info(BLURAY *bd) +{ + return &bd->disc_info; +} + /* * bdj callbacks */ _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
