Project import generated by Copybara.
PiperOrigin-RevId: 267280553
This commit is contained in:
Vendored
-4
@@ -20,11 +20,7 @@ cc_library(
|
||||
name = "libffmpeg",
|
||||
srcs = glob(
|
||||
[
|
||||
<<<<<<< HEAD
|
||||
"lib/x86_64-linux-gnu/libav*.so*",
|
||||
=======
|
||||
"lib/x86_64-linux-gnu/libav*.so",
|
||||
>>>>>>> Project import generated by Copybara.
|
||||
],
|
||||
),
|
||||
hdrs = glob(["include/x86_64-linux-gnu/libav*/*.h"]),
|
||||
|
||||
Vendored
-9
@@ -13,21 +13,12 @@ cc_library(
|
||||
name = "opencv",
|
||||
srcs = glob(
|
||||
[
|
||||
<<<<<<< HEAD
|
||||
"lib/x86_64-linux-gnu/libopencv_core.so*",
|
||||
"lib/x86_64-linux-gnu/libopencv_highgui.so*",
|
||||
"lib/x86_64-linux-gnu/libopencv_imgcodecs.so*",
|
||||
"lib/x86_64-linux-gnu/libopencv_imgproc.so*",
|
||||
"lib/x86_64-linux-gnu/libopencv_video.so*",
|
||||
"lib/x86_64-linux-gnu/libopencv_videoio.so*",
|
||||
=======
|
||||
"lib/x86_64-linux-gnu/libopencv_core.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_highgui.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_imgcodecs.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_imgproc.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_video.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_videoio.so",
|
||||
>>>>>>> Project import generated by Copybara.
|
||||
],
|
||||
),
|
||||
hdrs = glob(["include/opencv2/**/*.h*"]),
|
||||
|
||||
Reference in New Issue
Block a user