WIP Fix includes and linking with libav/ffmpeg

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f995bb52382f48388beef7782558a123c9402627..1518449c5a80b8d122ce9e1ad266f21629ed2fd9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ project(EN605.617.81.FA21_StephenSeo_DitheringProject)
 set(Project_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/src/image.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/video.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/src/opencl_handle.cc
 )
 
@@ -25,7 +26,7 @@ find_package(OpenCL REQUIRED)
 find_package(PNG REQUIRED)
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(FFMPEG_LIBAVCODEC REQUIRED libavcodec)
+pkg_check_modules(FFMPEG_LIBAVCODEC REQUIRED libavcodec libavformat libavutil)
 
 target_include_directories(DitheringProject PUBLIC
   ${OpenCL_INCLUDE_DIRS}

diff --git a/src/video.cc b/src/video.cc
index fcac248b2cba650e827a6998bf2bfc978050b309..ac865003976323229cce570d6395a63cc4630a8d 100644 (file)
--- a/src/video.cc
+++ b/src/video.cc
@@ -4,9 +4,9 @@
 #include <fstream>
 #include <iostream>
 
-#include <libavcodec/avcodec.h>
-#include <libavcodec/packet.h>
+extern "C" {
 #include <libavformat/avformat.h>
+}
 
 Video::Video(const char *video_filename) : Video(std::string(video_filename)) {}
 

diff --git a/src/video.h b/src/video.h
index 7e0e2836aa9f74c1a3f2fc90c3fd78a620ad831a..ac0af820d73ae2003eefb51ed5dbf69b92e8d8ca 100644 (file)
--- a/src/video.h
+++ b/src/video.h
@@ -1,7 +1,9 @@
 #ifndef IGPUP_DITHERING_PROJECT_VIDEO_H_
 #define IGPUP_DITHERING_PROJECT_VIDEO_H_
 
+extern "C" {
 #include <libavcodec/avcodec.h>
+}
 
 #include "image.h"