Raveler · wvaarle · Dec 14, 2018 · Dec 14, 2018 · Dec 14, 2018 · Dec 14, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,24 +1,7 @@
-################################################################################
-# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
-################################################################################
-
-/source/ffmpeg-cpp/.vs/ffmpeg-cpp/v15
-/source/ffmpeg-cpp/ffmpeg-cpp/obj
-/source/ffmpeg-cpp/demo/obj
-/source/ffmpeg-cpp/x64/Debug
-/source/ffmpeg-cpp/obj/Debug
-/source/ffmpeg-cpp/demo/samples/out.mp4
-/ffmpeg/include
+/ffmpeg/include
 /ffmpeg/lib
 /ffmpeg/bin
 /bin
 /lib
-
-/source/ffmpeg-cpp/decode_audio/obj
-/source/ffmpeg-cpp/encode_audio/obj
-/source/ffmpeg-cpp/encode_video/obj
-/source/ffmpeg-cpp/decode_video/obj
-/source/ffmpeg-cpp/filtering_video/obj
-/include
-
-/source/ffmpeg-cpp/remuxing/obj
+/.vs
+/.vscode
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(ffmpegcpp VERSION 1.0.0)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+file(GLOB_RECURSE ffmpegcpp_files "include/ffmpegcpp/*.h" "src/*.cpp")
+file(GLOB_RECURSE header_files "include/ffmpegcpp/*.h")
+
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${ffmpegcpp_files})
+
+add_library(ffmpegcpp STATIC ${ffmpegcpp_files})
+
+set_target_properties(ffmpegcpp PROPERTIES 
+    VERSION ${PROJECT_VERSION}
+    CXX_STANDARD 17
+)
+
+set_target_properties(ffmpegcpp PROPERTIES
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+)
+
+target_include_directories(ffmpegcpp PRIVATE 
+    include/ffmpegcpp
+    ffmpeg/include
+)
+
+target_link_libraries(ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avcodec.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avdevice.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avfilter.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avformat.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avutil.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/postproc.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/swresample.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/swscale.lib
+)
+
+install(TARGETS ffmpegcpp
+    ARCHIVE DESTINATION ${CMAKE_BINARY_DIR}/lib
+    LIBRARY DESTINATION ${CMAKE_BINARY_DIR}/lib
+    PUBLIC_HEADER DESTINATION ${CMAKE_BINARY_DIR}/lib/include
+)
+
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ffmpeg/bin/ DESTINATION ${CMAKE_BINARY_DIR}/bin/Release FILES_MATCHING PATTERN "*.dll")
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/samples/ DESTINATION ${CMAKE_BINARY_DIR}/bin/Release/samples)
+
+add_subdirectory(examples)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory(decode_audio)
+add_subdirectory(decode_video)
+add_subdirectory(demo)
+add_subdirectory(encode_audio)
+add_subdirectory(encode_video)
+add_subdirectory(filtering_video)
+add_subdirectory(remuxing)
diff --git a/examples/decode_audio/CMakeLists.txt b/examples/decode_audio/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_executable(decode_audio
+    decode_audio.cpp
+)
+
+set_target_properties(decode_audio PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(decode_audio PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(decode_audio ffmpegcpp)
+
+set_target_properties(decode_audio PROPERTIES FOLDER examples)
diff --git a/.../ffmpeg-cpp/decode_audio/decode_audio.cpp → examples/decode_audio/decode_audio.cpp b/.../ffmpeg-cpp/decode_audio/decode_audio.cpp → examples/decode_audio/decode_audio.cpp
diff --git a/examples/decode_video/CMakeLists.txt b/examples/decode_video/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_executable(decode_video
+    decode_video.cpp
+)
+
+set_target_properties(decode_video PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(decode_video PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(decode_video ffmpegcpp)
+
+set_target_properties(decode_video PROPERTIES FOLDER examples)
diff --git a/.../ffmpeg-cpp/decode_video/decode_video.cpp → examples/decode_video/decode_video.cpp b/.../ffmpeg-cpp/decode_video/decode_video.cpp → examples/decode_video/decode_video.cpp
diff --git a/examples/demo/CMakeLists.txt b/examples/demo/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+add_executable(demo
+    demo.cpp
+    GeneratedAudioSource.cpp
+    GeneratedVideoSource.cpp
+)
+
+set_target_properties(demo PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(demo PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(demo ffmpegcpp)
+
+set_target_properties(demo PROPERTIES FOLDER examples)
diff --git a/.../ffmpeg-cpp/demo/GeneratedAudioSource.cpp → examples/demo/GeneratedAudioSource.cpp b/.../ffmpeg-cpp/demo/GeneratedAudioSource.cpp → examples/demo/GeneratedAudioSource.cpp
diff --git a/...ce/ffmpeg-cpp/demo/GeneratedAudioSource.h → examples/demo/GeneratedAudioSource.h b/...ce/ffmpeg-cpp/demo/GeneratedAudioSource.h → examples/demo/GeneratedAudioSource.h
diff --git a/.../ffmpeg-cpp/demo/GeneratedVideoSource.cpp → examples/demo/GeneratedVideoSource.cpp b/.../ffmpeg-cpp/demo/GeneratedVideoSource.cpp → examples/demo/GeneratedVideoSource.cpp
diff --git a/...ce/ffmpeg-cpp/demo/GeneratedVideoSource.h → examples/demo/GeneratedVideoSource.h b/...ce/ffmpeg-cpp/demo/GeneratedVideoSource.h → examples/demo/GeneratedVideoSource.h
diff --git a/source/ffmpeg-cpp/demo/demo.cpp → examples/demo/demo.cpp b/source/ffmpeg-cpp/demo/demo.cpp → examples/demo/demo.cpp
diff --git a/examples/encode_audio/CMakeLists.txt b/examples/encode_audio/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_executable(encode_audio
+    encode_audio.cpp
+)
+
+set_target_properties(encode_audio PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(encode_audio PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(encode_audio ffmpegcpp)
+
+set_target_properties(encode_audio PROPERTIES FOLDER examples)
diff --git a/.../ffmpeg-cpp/encode_audio/encode_audio.cpp → examples/encode_audio/encode_audio.cpp b/.../ffmpeg-cpp/encode_audio/encode_audio.cpp → examples/encode_audio/encode_audio.cpp
diff --git a/examples/encode_video/CMakeLists.txt b/examples/encode_video/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_executable(encode_video
+    encode_video.cpp
+)
+
+set_target_properties(encode_video PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(encode_video PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(encode_video ffmpegcpp)
+
+set_target_properties(encode_video PROPERTIES FOLDER examples)
diff --git a/.../ffmpeg-cpp/encode_video/encode_video.cpp → examples/encode_video/encode_video.cpp b/.../ffmpeg-cpp/encode_video/encode_video.cpp → examples/encode_video/encode_video.cpp
diff --git a/examples/filtering_video/CMakeLists.txt b/examples/filtering_video/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_executable(filtering_video
+    filtering_video.cpp
+)
+
+set_target_properties(filtering_video PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(filtering_video PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(filtering_video ffmpegcpp)
+
+set_target_properties(filtering_video PROPERTIES FOLDER examples)
diff --git a/...g-cpp/filtering_video/filtering_video.cpp → examples/filtering_video/filtering_video.cpp b/...g-cpp/filtering_video/filtering_video.cpp → examples/filtering_video/filtering_video.cpp
diff --git a/examples/remuxing/CMakeLists.txt b/examples/remuxing/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_executable(remuxing
+    remuxing.cpp
+)
+
+set_target_properties(remuxing PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(remuxing PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(remuxing ffmpegcpp)
+
+set_target_properties(remuxing PROPERTIES FOLDER examples)
diff --git a/source/ffmpeg-cpp/remuxing/remuxing.cpp → examples/remuxing/remuxing.cpp b/source/ffmpeg-cpp/remuxing/remuxing.cpp → examples/remuxing/remuxing.cpp
diff --git a/...peg-cpp/ffmpeg-cpp/AudioFormatConverter.h → include/ffmpegcpp/AudioFormatConverter.h b/...peg-cpp/ffmpeg-cpp/AudioFormatConverter.h → include/ffmpegcpp/AudioFormatConverter.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/CodecDeducer.h → include/ffmpegcpp/CodecDeducer.h b/source/ffmpeg-cpp/ffmpeg-cpp/CodecDeducer.h → include/ffmpegcpp/CodecDeducer.h
diff --git a/...ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.h → include/ffmpegcpp/Codecs/AudioCodec.h b/...ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.h → include/ffmpegcpp/Codecs/AudioCodec.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Codec.h"
+#include "Codecs/Codec.h"
 #include "OpenCodec.h"
 
 namespace ffmpegcpp

diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/Codec.h → include/ffmpegcpp/Codecs/Codec.h b/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/Codec.h → include/ffmpegcpp/Codecs/Codec.h
diff --git a/...eg-cpp/ffmpeg-cpp/codecs/H264NVEncCodec.h → include/ffmpegcpp/Codecs/H264NVEncCodec.h b/...eg-cpp/ffmpeg-cpp/codecs/H264NVEncCodec.h → include/ffmpegcpp/Codecs/H264NVEncCodec.h
diff --git a/...eg-cpp/ffmpeg-cpp/codecs/H265NVEncCodec.h → include/ffmpegcpp/Codecs/H265NVEncCodec.h b/...eg-cpp/ffmpeg-cpp/codecs/H265NVEncCodec.h → include/ffmpegcpp/Codecs/H265NVEncCodec.h
diff --git a/...e/ffmpeg-cpp/ffmpeg-cpp/Codecs/JPGCodec.h → include/ffmpegcpp/Codecs/JPGCodec.h b/...e/ffmpeg-cpp/ffmpeg-cpp/Codecs/JPGCodec.h → include/ffmpegcpp/Codecs/JPGCodec.h
diff --git a/...e/ffmpeg-cpp/ffmpeg-cpp/Codecs/PNGCodec.h → include/ffmpegcpp/Codecs/PNGCodec.h b/...e/ffmpeg-cpp/ffmpeg-cpp/Codecs/PNGCodec.h → include/ffmpegcpp/Codecs/PNGCodec.h
diff --git a/...e/ffmpeg-cpp/ffmpeg-cpp/Codecs/VP9Codec.h → include/ffmpegcpp/Codecs/VP9Codec.h b/...e/ffmpeg-cpp/ffmpeg-cpp/Codecs/VP9Codec.h → include/ffmpegcpp/Codecs/VP9Codec.h
diff --git a/...ffmpeg-cpp/ffmpeg-cpp/Codecs/VideoCodec.h → include/ffmpegcpp/Codecs/VideoCodec.h b/...ffmpeg-cpp/ffmpeg-cpp/Codecs/VideoCodec.h → include/ffmpegcpp/Codecs/VideoCodec.h
diff --git a/...-cpp/ffmpeg-cpp/ConvertedAudioProcessor.h → include/ffmpegcpp/ConvertedAudioProcessor.h b/...-cpp/ffmpeg-cpp/ConvertedAudioProcessor.h → include/ffmpegcpp/ConvertedAudioProcessor.h
diff --git a/...pp/ffmpeg-cpp/Demuxing/AudioInputStream.h → ...ude/ffmpegcpp/Demuxing/AudioInputStream.h b/...pp/ffmpeg-cpp/Demuxing/AudioInputStream.h → ...ude/ffmpegcpp/Demuxing/AudioInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ffmpeg.h"
-#include "InputStream.h"
-#include "Frame Sinks/AudioFrameSink.h"
+#include "Demuxing/InputStream.h"
+#include "FrameSinks/AudioFrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...peg-cpp/ffmpeg-cpp/Demuxing/InputStream.h → include/ffmpegcpp/Demuxing/InputStream.h b/...peg-cpp/ffmpeg-cpp/Demuxing/InputStream.h → include/ffmpegcpp/Demuxing/InputStream.h
@@ -2,7 +2,7 @@
 
 #include "ffmpeg.h"
 #include "std.h"
-#include "Frame Sinks/FrameSink.h"
+#include "FrameSinks/FrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...pp/ffmpeg-cpp/Demuxing/VideoInputStream.h → ...ude/ffmpegcpp/Demuxing/VideoInputStream.h b/...pp/ffmpeg-cpp/Demuxing/VideoInputStream.h → ...ude/ffmpegcpp/Demuxing/VideoInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ffmpeg.h"
-#include "InputStream.h"
-#include "Frame Sinks/VideoFrameSink.h"
+#include "Demuxing/InputStream.h"
+#include "FrameSinks/VideoFrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...e/ffmpeg-cpp/ffmpeg-cpp/FFmpegException.h → include/ffmpegcpp/FFmpegException.h b/...e/ffmpeg-cpp/ffmpeg-cpp/FFmpegException.h → include/ffmpegcpp/FFmpegException.h
diff --git a/...cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.h → include/ffmpegcpp/FrameSinks/AudioEncoder.h b/...cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.h → include/ffmpegcpp/FrameSinks/AudioEncoder.h
@@ -3,7 +3,7 @@
 #include "ffmpeg.h"
 #include "std.h"
 
-#include "Frame Sinks/AudioFrameSink.h"
+#include "FrameSinks/AudioFrameSink.h"
 #include "Codecs/AudioCodec.h"
 #include "ConvertedAudioProcessor.h"
 #include "AudioFormatConverter.h"

diff --git a/...p/ffmpeg-cpp/Frame Sinks/AudioFrameSink.h → ...ude/ffmpegcpp/FrameSinks/AudioFrameSink.h b/...p/ffmpeg-cpp/Frame Sinks/AudioFrameSink.h → ...ude/ffmpegcpp/FrameSinks/AudioFrameSink.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FrameSink.h"
+#include "FrameSinks/FrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...eg-cpp/ffmpeg-cpp/Frame Sinks/FrameSink.h → include/ffmpegcpp/FrameSinks/FrameSink.h b/...eg-cpp/ffmpeg-cpp/Frame Sinks/FrameSink.h → include/ffmpegcpp/FrameSinks/FrameSink.h
diff --git a/...cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.h → include/ffmpegcpp/FrameSinks/VideoEncoder.h b/...cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.h → include/ffmpegcpp/FrameSinks/VideoEncoder.h
@@ -2,7 +2,7 @@
 
 #include "ffmpeg.h"
 
-#include "Frame Sinks/VideoFrameSink.h"
+#include "FrameSinks/VideoFrameSink.h"
 #include "Codecs/VideoCodec.h"
 #include "VideoFormatConverter.h"
 #include "Muxing/Muxer.h"

diff --git a/...-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.h → include/ffmpegcpp/FrameSinks/VideoFilter.h b/...-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.h → include/ffmpegcpp/FrameSinks/VideoFilter.h
@@ -2,7 +2,7 @@
 
 #include "ffmpeg.h"
 
-#include "VideoFrameSink.h"
+#include "FrameSinks/VideoFrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...p/ffmpeg-cpp/Frame Sinks/VideoFrameSink.h → ...ude/ffmpegcpp/FrameSinks/VideoFrameSink.h b/...p/ffmpeg-cpp/Frame Sinks/VideoFrameSink.h → ...ude/ffmpegcpp/FrameSinks/VideoFrameSink.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FrameSink.h"
+#include "FrameSinks/FrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...cpp/ffmpeg-cpp/Muxing/AudioOutputStream.h → include/ffmpegcpp/Muxing/AudioOutputStream.h b/...cpp/ffmpeg-cpp/Muxing/AudioOutputStream.h → include/ffmpegcpp/Muxing/AudioOutputStream.h
@@ -2,8 +2,8 @@
 
 #include "ffmpeg.h"
 #include "Codecs/Codec.h"
-#include "OutputStream.h"
-#include "Muxer.h"
+#include "Muxing/OutputStream.h"
+#include "Muxing/Muxer.h"
 
 namespace ffmpegcpp
 {

diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.h → include/ffmpegcpp/Muxing/Muxer.h b/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.h → include/ffmpegcpp/Muxing/Muxer.h
diff --git a/...mpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.h → include/ffmpegcpp/Muxing/OutputStream.h b/...mpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.h → include/ffmpegcpp/Muxing/OutputStream.h
@@ -2,7 +2,7 @@
 
 #include "ffmpeg.h"
 #include "Codecs/Codec.h"
-#include "Muxer.h"
+#include "Muxing/Muxer.h"
 
 namespace ffmpegcpp
 {

diff --git a/...cpp/ffmpeg-cpp/Muxing/VideoOutputStream.h → include/ffmpegcpp/Muxing/VideoOutputStream.h b/...cpp/ffmpeg-cpp/Muxing/VideoOutputStream.h → include/ffmpegcpp/Muxing/VideoOutputStream.h
@@ -2,8 +2,8 @@
 
 #include "ffmpeg.h"
 #include "Codecs/Codec.h"
-#include "OutputStream.h"
-#include "Muxer.h"
+#include "Muxing/OutputStream.h"
+#include "Muxing/Muxer.h"
 
 namespace ffmpegcpp
 {

diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/OpenCodec.h → include/ffmpegcpp/OpenCodec.h b/source/ffmpeg-cpp/ffmpeg-cpp/OpenCodec.h → include/ffmpegcpp/OpenCodec.h
diff --git a/...e/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.h → include/ffmpegcpp/Sources/Demuxer.h b/...e/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.h → include/ffmpegcpp/Sources/Demuxer.h
diff --git a/...pp/ffmpeg-cpp/Sources/EncodedFileSource.h → ...ude/ffmpegcpp/Sources/EncodedFileSource.h b/...pp/ffmpeg-cpp/Sources/EncodedFileSource.h → ...ude/ffmpegcpp/Sources/EncodedFileSource.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ffmpeg.h"
-#include "Frame Sinks/FrameSink.h"
-#include "InputSource.h"
+#include "FrameSinks/FrameSink.h"
+#include "Sources/InputSource.h"
 
 namespace ffmpegcpp
 {

diff --git a/...mpeg-cpp/ffmpeg-cpp/Sources/InputSource.h → include/ffmpegcpp/Sources/InputSource.h b/...mpeg-cpp/ffmpeg-cpp/Sources/InputSource.h → include/ffmpegcpp/Sources/InputSource.h
diff --git a/...p/ffmpeg-cpp/Sources/RawAudioDataSource.h → ...de/ffmpegcpp/Sources/RawAudioDataSource.h b/...p/ffmpeg-cpp/Sources/RawAudioDataSource.h → ...de/ffmpegcpp/Sources/RawAudioDataSource.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ffmpeg.h"
-#include "Frame Sinks/AudioFrameSink.h"
+#include "FrameSinks/AudioFrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...p/ffmpeg-cpp/Sources/RawAudioFileSource.h → ...de/ffmpegcpp/Sources/RawAudioFileSource.h b/...p/ffmpeg-cpp/Sources/RawAudioFileSource.h → ...de/ffmpegcpp/Sources/RawAudioFileSource.h
@@ -2,8 +2,8 @@
 
 #include "ffmpeg.h"
 
-#include "InputSource.h"
-#include "Demuxer.h"
+#include "Sources/InputSource.h"
+#include "Sources/Demuxer.h"
 
 
 namespace ffmpegcpp

diff --git a/...p/ffmpeg-cpp/Sources/RawVideoDataSource.h → ...de/ffmpegcpp/Sources/RawVideoDataSource.h b/...p/ffmpeg-cpp/Sources/RawVideoDataSource.h → ...de/ffmpegcpp/Sources/RawVideoDataSource.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ffmpeg.h"
-#include "Frame Sinks/VideoFrameSink.h"
+#include "FrameSinks/VideoFrameSink.h"
 
 namespace ffmpegcpp
 {

diff --git a/...p/ffmpeg-cpp/Sources/RawVideoFileSource.h → ...de/ffmpegcpp/Sources/RawVideoFileSource.h b/...p/ffmpeg-cpp/Sources/RawVideoFileSource.h → ...de/ffmpegcpp/Sources/RawVideoFileSource.h
@@ -2,8 +2,8 @@
 
 #include "ffmpeg.h"
 
-#include "InputSource.h"
-#include "Demuxer.h"
+#include "Sources/InputSource.h"
+#include "Sources/Demuxer.h"
 
 
 namespace ffmpegcpp

diff --git a/...peg-cpp/ffmpeg-cpp/VideoFormatConverter.h → include/ffmpegcpp/VideoFormatConverter.h b/...peg-cpp/ffmpeg-cpp/VideoFormatConverter.h → include/ffmpegcpp/VideoFormatConverter.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg.h → include/ffmpegcpp/ffmpeg.h b/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg.h → include/ffmpegcpp/ffmpeg.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpegcpp.h → include/ffmpegcpp/ffmpegcpp.h b/source/ffmpeg-cpp/ffmpeg-cpp/ffmpegcpp.h → include/ffmpegcpp/ffmpegcpp.h
@@ -11,9 +11,9 @@
 #include "Sources/RawVideoDataSource.h"
 #include "Sources/EncodedFileSource.h"
 
-#include "Frame Sinks/VideoEncoder.h"
-#include "Frame Sinks/AudioEncoder.h"
-#include "Frame Sinks/VideoFilter.h"
+#include "FrameSinks/VideoEncoder.h"
+#include "FrameSinks/AudioEncoder.h"
+#include "FrameSinks/VideoFilter.h"
 
 #include "Codecs/AudioCodec.h"
 

diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/std.h → include/ffmpegcpp/std.h b/source/ffmpeg-cpp/ffmpeg-cpp/std.h → include/ffmpegcpp/std.h