Project import generated by Copybara.

PiperOrigin-RevId: 267280553
2019-09-04 19:11:29 -07:00
parent af67642055
commit dc9216dc59
57 changed files with 0 additions and 582 deletions
@@ -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"]),