stephenseo/EN605.617.81.FA21_StephenSeo_DitheringProject
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP Fix includes and linking with libav/ffmpeg

Browse source
This commit is contained in:
Stephen Seo 2021-11-29 19:24:50 +09:00
parent cfdd411b99
commit 6677fba89c
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -4,6 +4,7 @@ project(EN605.617.81.FA21_StephenSeo_DitheringProject)
set(Project_SOURCES set(Project_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc
${CMAKE_CURRENT_SOURCE_DIR}/src/image.cc ${CMAKE_CURRENT_SOURCE_DIR}/src/image.cc
${CMAKE_CURRENT_SOURCE_DIR}/src/video.cc
${CMAKE_CURRENT_SOURCE_DIR}/src/opencl_handle.cc ${CMAKE_CURRENT_SOURCE_DIR}/src/opencl_handle.cc
) )
@ -25,7 +26,7 @@ find_package(OpenCL REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(PkgConfig 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 target_include_directories(DitheringProject PUBLIC
${OpenCL_INCLUDE_DIRS} ${OpenCL_INCLUDE_DIRS}

4
src/video.cc
View file

@ -4,9 +4,9 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <libavcodec/avcodec.h> extern "C" {
#include <libavcodec/packet.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
}
Video::Video(const char *video_filename) : Video(std::string(video_filename)) {} Video::Video(const char *video_filename) : Video(std::string(video_filename)) {}

2
src/video.h
View file

@ -1,7 +1,9 @@
#ifndef IGPUP_DITHERING_PROJECT_VIDEO_H_ #ifndef IGPUP_DITHERING_PROJECT_VIDEO_H_
#define IGPUP_DITHERING_PROJECT_VIDEO_H_ #define IGPUP_DITHERING_PROJECT_VIDEO_H_
extern "C" {
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
}
#include "image.h" #include "image.h"