libbluray | branch: master | hpi1 <h...@anonymous.org> | Thu May 4 11:30:01 2017 +0300| [4d3159a3dcbd807f83ae797227515ee23d8bc7e6] | committer: hpi1
Fix include paths > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=4d3159a3dcbd807f83ae797227515ee23d8bc7e6 --- src/devtools/bdj_test.c | 2 +- src/devtools/bdjo_dump.c | 4 ++-- src/devtools/clpi_dump.c | 4 ++-- src/devtools/hdmv_test.c | 4 ++-- src/devtools/mobj_dump.c | 6 +++--- src/devtools/mpls_dump.c | 4 ++-- src/examples/bd_info.c | 4 ++-- src/examples/bdsplice.c | 2 +- src/examples/index_dump.c | 2 +- src/examples/libbluray_test.c | 2 +- src/examples/list_titles.c | 2 +- src/examples/sound_dump.c | 2 +- src/libbluray/bdj/native/bdjo.c | 2 +- src/libbluray/bdj/native/org_videolan_Libbluray.c | 10 +++++----- src/libbluray/decoders/graphics_controller.h | 2 +- src/libbluray/decoders/textst_render.c | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/devtools/bdj_test.c b/src/devtools/bdj_test.c index d9ebd16b..870d6197 100644 --- a/src/devtools/bdj_test.c +++ b/src/devtools/bdj_test.c @@ -30,7 +30,7 @@ #include <stdlib.h> #include <unistd.h> -#include "libbluray/bluray.h" +#include "bluray.h" #if defined(_WIN32) #include <windows.h> diff --git a/src/devtools/bdjo_dump.c b/src/devtools/bdjo_dump.c index c9c8141f..616246a7 100644 --- a/src/devtools/bdjo_dump.c +++ b/src/devtools/bdjo_dump.c @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/bluray.h" -#include "libbluray/bdj/bdjo_data.h" +#include "bdj/bdjo_data.h" +#include "bluray.h" #include <stdio.h> #include <string.h> diff --git a/src/devtools/clpi_dump.c b/src/devtools/clpi_dump.c index da412e9e..98aa9cd1 100644 --- a/src/devtools/clpi_dump.c +++ b/src/devtools/clpi_dump.c @@ -23,8 +23,8 @@ #include <unistd.h> #include <inttypes.h> -#include "libbluray/bdnav/clpi_data.h" -#include "libbluray/bluray.h" +#include "bluray.h" +#include "bdnav/clpi_data.h" #include "util.h" diff --git a/src/devtools/hdmv_test.c b/src/devtools/hdmv_test.c index 7016ee1c..d2894d9b 100644 --- a/src/devtools/hdmv_test.c +++ b/src/devtools/hdmv_test.c @@ -22,9 +22,9 @@ #include <string.h> #include <inttypes.h> +#include "decoders/overlay.h" #include "util/log_control.h" -#include "libbluray/bluray.h" -#include "libbluray/decoders/overlay.h" +#include "bluray.h" #define PRINT_EV0(e) \ diff --git a/src/devtools/mobj_dump.c b/src/devtools/mobj_dump.c index 3eaf9f41..68e78dd4 100644 --- a/src/devtools/mobj_dump.c +++ b/src/devtools/mobj_dump.c @@ -17,10 +17,10 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/bluray.h" +#include "bluray.h" -#include "libbluray/hdmv/mobj_data.h" -#include "libbluray/hdmv/mobj_print.h" +#include "hdmv/mobj_data.h" +#include "hdmv/mobj_print.h" #include <stdio.h> #include <string.h> diff --git a/src/devtools/mpls_dump.c b/src/devtools/mpls_dump.c index 147314e4..0f286c12 100644 --- a/src/devtools/mpls_dump.c +++ b/src/devtools/mpls_dump.c @@ -25,8 +25,8 @@ #include <string.h> #include <libgen.h> -#include "libbluray/bdnav/mpls_parse.h" -#include "libbluray/bluray.h" +#include "bdnav/mpls_parse.h" +#include "bluray.h" #include "util.h" diff --git a/src/examples/bd_info.c b/src/examples/bd_info.c index eb282ce1..9fcd33e2 100644 --- a/src/examples/bd_info.c +++ b/src/examples/bd_info.c @@ -22,8 +22,8 @@ #include <inttypes.h> #include <unistd.h> -#include "libbluray/bdnav/meta_data.h" -#include "libbluray/bluray.h" +#include "bdnav/meta_data.h" +#include "bluray.h" static const char *_yes_no(int i) { diff --git a/src/examples/bdsplice.c b/src/examples/bdsplice.c index 4cf71e5e..6fb54c2f 100644 --- a/src/examples/bdsplice.c +++ b/src/examples/bdsplice.c @@ -27,7 +27,7 @@ #include <libgen.h> #include <inttypes.h> -#include "libbluray/bluray.h" +#include "bluray.h" #define PKT_SIZE 192 #define BUF_SIZE (PKT_SIZE * 1024) diff --git a/src/examples/index_dump.c b/src/examples/index_dump.c index f01e6086..f6a6595c 100644 --- a/src/examples/index_dump.c +++ b/src/examples/index_dump.c @@ -19,7 +19,7 @@ #include <stdio.h> -#include "libbluray/bluray.h" +#include "bluray.h" static void _indx_print_title(const BLURAY_TITLE *title, int normal_title) { diff --git a/src/examples/libbluray_test.c b/src/examples/libbluray_test.c index d4934a12..4588093e 100644 --- a/src/examples/libbluray_test.c +++ b/src/examples/libbluray_test.c @@ -23,7 +23,7 @@ #include <string.h> #include <inttypes.h> -#include "libbluray/bluray.h" +#include "bluray.h" int main(int argc, char *argv[]) { diff --git a/src/examples/list_titles.c b/src/examples/list_titles.c index 9319e9e2..6f6edf89 100644 --- a/src/examples/list_titles.c +++ b/src/examples/list_titles.c @@ -17,7 +17,7 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/bluray.h" +#include "bluray.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/examples/sound_dump.c b/src/examples/sound_dump.c index a44e65b3..5e657632 100644 --- a/src/examples/sound_dump.c +++ b/src/examples/sound_dump.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <stdlib.h> -#include "libbluray/bluray.h" +#include "bluray.h" static void _sound_print(int sound_index, BLURAY_SOUND_EFFECT *data) diff --git a/src/libbluray/bdj/native/bdjo.c b/src/libbluray/bdj/native/bdjo.c index 9c1056b0..87396950 100644 --- a/src/libbluray/bdj/native/bdjo.c +++ b/src/libbluray/bdj/native/bdjo.c @@ -31,7 +31,7 @@ #include "util.h" -#include "libbluray/bdj/bdjo_data.h" +#include "bdj/bdjo_data.h" #include "util/logging.h" diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c index 77e98337..5623134c 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.c +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c @@ -25,12 +25,12 @@ #include "bdjo.h" #include "util.h" -#include "libbluray/bdj/bdjo_parse.h" +#include "bdj/bdjo_parse.h" -#include "libbluray/bluray.h" -#include "libbluray/bluray_internal.h" -#include "libbluray/decoders/overlay.h" -#include "libbluray/disc/disc.h" +#include "bluray.h" +#include "bluray_internal.h" +#include "decoders/overlay.h" +#include "disc/disc.h" #include "file/file.h" #include "util/logging.h" diff --git a/src/libbluray/decoders/graphics_controller.h b/src/libbluray/decoders/graphics_controller.h index dca6d4ab..e356f048 100644 --- a/src/libbluray/decoders/graphics_controller.h +++ b/src/libbluray/decoders/graphics_controller.h @@ -22,7 +22,7 @@ #include "util/attributes.h" -#include "libbluray/bdnav/uo_mask_table.h" +#include "bdnav/uo_mask_table.h" #include <stdint.h> #include <stddef.h> /* size_t */ diff --git a/src/libbluray/decoders/textst_render.c b/src/libbluray/decoders/textst_render.c index 967964a6..e02a473e 100644 --- a/src/libbluray/decoders/textst_render.c +++ b/src/libbluray/decoders/textst_render.c @@ -23,7 +23,7 @@ #include "util/macro.h" #include "util/logging.h" -#include "libbluray/bluray.h" /* bd_char_code_e */ +#include "bluray.h" /* bd_char_code_e */ #include <stdint.h> _______________________________________________ libbluray-devel mailing list libbluray-devel@videolan.org https://mailman.videolan.org/listinfo/libbluray-devel