diff --git a/.gitignore b/.gitignore
index 6466313..ca32786 100644
--- 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
new file mode 100644
index 0000000..772f12f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..738c5c3
--- /dev/null
+++ 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
new file mode 100644
index 0000000..45606a9
--- /dev/null
+++ 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/source/ffmpeg-cpp/decode_audio/decode_audio.cpp b/examples/decode_audio/decode_audio.cpp
similarity index 100%
rename from source/ffmpeg-cpp/decode_audio/decode_audio.cpp
rename to examples/decode_audio/decode_audio.cpp
diff --git a/examples/decode_video/CMakeLists.txt b/examples/decode_video/CMakeLists.txt
new file mode 100644
index 0000000..9e57c11
--- /dev/null
+++ 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/source/ffmpeg-cpp/decode_video/decode_video.cpp b/examples/decode_video/decode_video.cpp
similarity index 100%
rename from source/ffmpeg-cpp/decode_video/decode_video.cpp
rename to examples/decode_video/decode_video.cpp
diff --git a/examples/demo/CMakeLists.txt b/examples/demo/CMakeLists.txt
new file mode 100644
index 0000000..68ab5f3
--- /dev/null
+++ 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/source/ffmpeg-cpp/demo/GeneratedAudioSource.cpp b/examples/demo/GeneratedAudioSource.cpp
similarity index 100%
rename from source/ffmpeg-cpp/demo/GeneratedAudioSource.cpp
rename to examples/demo/GeneratedAudioSource.cpp
diff --git a/source/ffmpeg-cpp/demo/GeneratedAudioSource.h b/examples/demo/GeneratedAudioSource.h
similarity index 100%
rename from source/ffmpeg-cpp/demo/GeneratedAudioSource.h
rename to examples/demo/GeneratedAudioSource.h
diff --git a/source/ffmpeg-cpp/demo/GeneratedVideoSource.cpp b/examples/demo/GeneratedVideoSource.cpp
similarity index 100%
rename from source/ffmpeg-cpp/demo/GeneratedVideoSource.cpp
rename to examples/demo/GeneratedVideoSource.cpp
diff --git a/source/ffmpeg-cpp/demo/GeneratedVideoSource.h b/examples/demo/GeneratedVideoSource.h
similarity index 100%
rename from source/ffmpeg-cpp/demo/GeneratedVideoSource.h
rename to examples/demo/GeneratedVideoSource.h
diff --git a/source/ffmpeg-cpp/demo/demo.cpp b/examples/demo/demo.cpp
similarity index 100%
rename from source/ffmpeg-cpp/demo/demo.cpp
rename to examples/demo/demo.cpp
diff --git a/examples/encode_audio/CMakeLists.txt b/examples/encode_audio/CMakeLists.txt
new file mode 100644
index 0000000..5caddf5
--- /dev/null
+++ 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/source/ffmpeg-cpp/encode_audio/encode_audio.cpp b/examples/encode_audio/encode_audio.cpp
similarity index 100%
rename from source/ffmpeg-cpp/encode_audio/encode_audio.cpp
rename to examples/encode_audio/encode_audio.cpp
diff --git a/examples/encode_video/CMakeLists.txt b/examples/encode_video/CMakeLists.txt
new file mode 100644
index 0000000..f58f7e0
--- /dev/null
+++ 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/source/ffmpeg-cpp/encode_video/encode_video.cpp b/examples/encode_video/encode_video.cpp
similarity index 100%
rename from source/ffmpeg-cpp/encode_video/encode_video.cpp
rename to examples/encode_video/encode_video.cpp
diff --git a/examples/filtering_video/CMakeLists.txt b/examples/filtering_video/CMakeLists.txt
new file mode 100644
index 0000000..ab86583
--- /dev/null
+++ 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/source/ffmpeg-cpp/filtering_video/filtering_video.cpp b/examples/filtering_video/filtering_video.cpp
similarity index 100%
rename from source/ffmpeg-cpp/filtering_video/filtering_video.cpp
rename to examples/filtering_video/filtering_video.cpp
diff --git a/examples/remuxing/CMakeLists.txt b/examples/remuxing/CMakeLists.txt
new file mode 100644
index 0000000..3f0f4d6
--- /dev/null
+++ 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 b/examples/remuxing/remuxing.cpp
similarity index 100%
rename from source/ffmpeg-cpp/remuxing/remuxing.cpp
rename to examples/remuxing/remuxing.cpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/AudioFormatConverter.h b/include/ffmpegcpp/AudioFormatConverter.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/AudioFormatConverter.h
rename to include/ffmpegcpp/AudioFormatConverter.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/CodecDeducer.h b/include/ffmpegcpp/CodecDeducer.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/CodecDeducer.h
rename to include/ffmpegcpp/CodecDeducer.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.h b/include/ffmpegcpp/Codecs/AudioCodec.h
similarity index 95%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.h
rename to include/ffmpegcpp/Codecs/AudioCodec.h
index ec605cd..d56e84f 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.h
+++ b/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 b/include/ffmpegcpp/Codecs/Codec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/Codec.h
rename to include/ffmpegcpp/Codecs/Codec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/codecs/H264NVEncCodec.h b/include/ffmpegcpp/Codecs/H264NVEncCodec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/codecs/H264NVEncCodec.h
rename to include/ffmpegcpp/Codecs/H264NVEncCodec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/codecs/H265NVEncCodec.h b/include/ffmpegcpp/Codecs/H265NVEncCodec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/codecs/H265NVEncCodec.h
rename to include/ffmpegcpp/Codecs/H265NVEncCodec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/JPGCodec.h b/include/ffmpegcpp/Codecs/JPGCodec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/JPGCodec.h
rename to include/ffmpegcpp/Codecs/JPGCodec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/PNGCodec.h b/include/ffmpegcpp/Codecs/PNGCodec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/PNGCodec.h
rename to include/ffmpegcpp/Codecs/PNGCodec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VP9Codec.h b/include/ffmpegcpp/Codecs/VP9Codec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VP9Codec.h
rename to include/ffmpegcpp/Codecs/VP9Codec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VideoCodec.h b/include/ffmpegcpp/Codecs/VideoCodec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VideoCodec.h
rename to include/ffmpegcpp/Codecs/VideoCodec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ConvertedAudioProcessor.h b/include/ffmpegcpp/ConvertedAudioProcessor.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/ConvertedAudioProcessor.h
rename to include/ffmpegcpp/ConvertedAudioProcessor.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/AudioInputStream.h b/include/ffmpegcpp/Demuxing/AudioInputStream.h
similarity index 78%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/AudioInputStream.h
rename to include/ffmpegcpp/Demuxing/AudioInputStream.h
index bfdee63..cab0d72 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/AudioInputStream.h
+++ b/include/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/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/InputStream.h b/include/ffmpegcpp/Demuxing/InputStream.h
similarity index 93%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/InputStream.h
rename to include/ffmpegcpp/Demuxing/InputStream.h
index f55fabc..a9c2404 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/InputStream.h
+++ b/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/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/VideoInputStream.h b/include/ffmpegcpp/Demuxing/VideoInputStream.h
similarity index 78%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/VideoInputStream.h
rename to include/ffmpegcpp/Demuxing/VideoInputStream.h
index 1436f4f..2343dc4 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/VideoInputStream.h
+++ b/include/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/source/ffmpeg-cpp/ffmpeg-cpp/FFmpegException.h b/include/ffmpegcpp/FFmpegException.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/FFmpegException.h
rename to include/ffmpegcpp/FFmpegException.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.h b/include/ffmpegcpp/FrameSinks/AudioEncoder.h
similarity index 95%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.h
rename to include/ffmpegcpp/FrameSinks/AudioEncoder.h
index f60effa..0d15ba4 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.h	
+++ b/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/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioFrameSink.h b/include/ffmpegcpp/FrameSinks/AudioFrameSink.h
similarity index 85%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioFrameSink.h
rename to include/ffmpegcpp/FrameSinks/AudioFrameSink.h
index 13d7fa7..d1c797f 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioFrameSink.h	
+++ b/include/ffmpegcpp/FrameSinks/AudioFrameSink.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FrameSink.h"
+#include "FrameSinks/FrameSink.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/FrameSink.h b/include/ffmpegcpp/FrameSinks/FrameSink.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/FrameSink.h
rename to include/ffmpegcpp/FrameSinks/FrameSink.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.h b/include/ffmpegcpp/FrameSinks/VideoEncoder.h
similarity index 96%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.h
rename to include/ffmpegcpp/FrameSinks/VideoEncoder.h
index daec115..eda2600 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.h	
+++ b/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/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.h b/include/ffmpegcpp/FrameSinks/VideoFilter.h
similarity index 94%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.h
rename to include/ffmpegcpp/FrameSinks/VideoFilter.h
index 1afe66e..6c893b4 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.h	
+++ b/include/ffmpegcpp/FrameSinks/VideoFilter.h
@@ -2,7 +2,7 @@
 
 #include "ffmpeg.h"
 
-#include "VideoFrameSink.h"
+#include "FrameSinks/VideoFrameSink.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFrameSink.h b/include/ffmpegcpp/FrameSinks/VideoFrameSink.h
similarity index 85%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFrameSink.h
rename to include/ffmpegcpp/FrameSinks/VideoFrameSink.h
index ece64aa..72a45ff 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFrameSink.h	
+++ b/include/ffmpegcpp/FrameSinks/VideoFrameSink.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FrameSink.h"
+#include "FrameSinks/FrameSink.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/AudioOutputStream.h b/include/ffmpegcpp/Muxing/AudioOutputStream.h
similarity index 90%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/AudioOutputStream.h
rename to include/ffmpegcpp/Muxing/AudioOutputStream.h
index 0181295..688b549 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/AudioOutputStream.h
+++ b/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 b/include/ffmpegcpp/Muxing/Muxer.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.h
rename to include/ffmpegcpp/Muxing/Muxer.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.h b/include/ffmpegcpp/Muxing/OutputStream.h
similarity index 95%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.h
rename to include/ffmpegcpp/Muxing/OutputStream.h
index 9164497..26088cd 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.h
+++ b/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/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/VideoOutputStream.h b/include/ffmpegcpp/Muxing/VideoOutputStream.h
similarity index 90%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/VideoOutputStream.h
rename to include/ffmpegcpp/Muxing/VideoOutputStream.h
index fe4fc6d..c9be26d 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/VideoOutputStream.h
+++ b/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 b/include/ffmpegcpp/OpenCodec.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/OpenCodec.h
rename to include/ffmpegcpp/OpenCodec.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.h b/include/ffmpegcpp/Sources/Demuxer.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.h
rename to include/ffmpegcpp/Sources/Demuxer.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/EncodedFileSource.h b/include/ffmpegcpp/Sources/EncodedFileSource.h
similarity index 93%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/EncodedFileSource.h
rename to include/ffmpegcpp/Sources/EncodedFileSource.h
index 8637d03..d663cd2 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/EncodedFileSource.h
+++ b/include/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/source/ffmpeg-cpp/ffmpeg-cpp/Sources/InputSource.h b/include/ffmpegcpp/Sources/InputSource.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/InputSource.h
rename to include/ffmpegcpp/Sources/InputSource.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioDataSource.h b/include/ffmpegcpp/Sources/RawAudioDataSource.h
similarity index 94%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioDataSource.h
rename to include/ffmpegcpp/Sources/RawAudioDataSource.h
index 418f032..e144a8e 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioDataSource.h
+++ b/include/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/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioFileSource.h b/include/ffmpegcpp/Sources/RawAudioFileSource.h
similarity index 87%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioFileSource.h
rename to include/ffmpegcpp/Sources/RawAudioFileSource.h
index 23270a5..19a90e8 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioFileSource.h
+++ b/include/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/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoDataSource.h b/include/ffmpegcpp/Sources/RawVideoDataSource.h
similarity index 96%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoDataSource.h
rename to include/ffmpegcpp/Sources/RawVideoDataSource.h
index d131b05..b62a154 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoDataSource.h
+++ b/include/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/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoFileSource.h b/include/ffmpegcpp/Sources/RawVideoFileSource.h
similarity index 91%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoFileSource.h
rename to include/ffmpegcpp/Sources/RawVideoFileSource.h
index 4d45222..781074b 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoFileSource.h
+++ b/include/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/source/ffmpeg-cpp/ffmpeg-cpp/VideoFormatConverter.h b/include/ffmpegcpp/VideoFormatConverter.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/VideoFormatConverter.h
rename to include/ffmpegcpp/VideoFormatConverter.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg.h b/include/ffmpegcpp/ffmpeg.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg.h
rename to include/ffmpegcpp/ffmpeg.h
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpegcpp.h b/include/ffmpegcpp/ffmpegcpp.h
similarity index 83%
rename from source/ffmpeg-cpp/ffmpeg-cpp/ffmpegcpp.h
rename to include/ffmpegcpp/ffmpegcpp.h
index 6b1f519..8890a08 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpegcpp.h
+++ b/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 b/include/ffmpegcpp/std.h
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/std.h
rename to include/ffmpegcpp/std.h
diff --git a/source/ffmpeg-cpp/FFmpegLibraryLocationProperty.props b/source/ffmpeg-cpp/FFmpegLibraryLocationProperty.props
deleted file mode 100644
index b2dffa9..0000000
--- a/source/ffmpeg-cpp/FFmpegLibraryLocationProperty.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <FFmpegLibraryDir>$(ProjectDir)..\..\..\ffmpeg\</FFmpegLibraryDir>
-    <SamplesDir>$(ProjectDir)..\..\..\samples</SamplesDir>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="FFmpegLibraryDir">
-      <Value>$(FFmpegLibraryDir)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-    <BuildMacro Include="SamplesDir">
-      <Value>$(SamplesDir)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj b/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj
deleted file mode 100644
index e0fb0d2..0000000
--- a/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{C6101E18-D73B-430C-A79C-084E1236EA94}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>decodeaudio</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="decode_audio.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ffmpeg-cpp\ffmpeg-cpp.vcxproj">
-      <Project>{babfd64d-9bf1-4328-b977-24bf81800620}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj.filters b/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj.filters
deleted file mode 100644
index 88e5ec5..0000000
--- a/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="decode_audio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj.user b/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj.user
deleted file mode 100644
index 6c84d89..0000000
--- a/source/ffmpeg-cpp/decode_audio/decode_audio.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/decode_video/decode_video.vcxproj b/source/ffmpeg-cpp/decode_video/decode_video.vcxproj
deleted file mode 100644
index fccf89e..0000000
--- a/source/ffmpeg-cpp/decode_video/decode_video.vcxproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{AAD3AB93-F831-4339-8AAD-DC956B9B9233}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>decodeaudio</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="decode_video.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ffmpeg-cpp\ffmpeg-cpp.vcxproj">
-      <Project>{babfd64d-9bf1-4328-b977-24bf81800620}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/decode_video/decode_video.vcxproj.filters b/source/ffmpeg-cpp/decode_video/decode_video.vcxproj.filters
deleted file mode 100644
index dbaf137..0000000
--- a/source/ffmpeg-cpp/decode_video/decode_video.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="decode_video.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/decode_video/decode_video.vcxproj.user b/source/ffmpeg-cpp/decode_video/decode_video.vcxproj.user
deleted file mode 100644
index 6c84d89..0000000
--- a/source/ffmpeg-cpp/decode_video/decode_video.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/demo/demo.vcxproj b/source/ffmpeg-cpp/demo/demo.vcxproj
deleted file mode 100644
index 35e0da7..0000000
--- a/source/ffmpeg-cpp/demo/demo.vcxproj
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>demo</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <SpectreMitigation>false</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="demo.cpp" />
-    <ClCompile Include="GeneratedAudioSource.cpp" />
-    <ClCompile Include="GeneratedVideoSource.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ffmpeg-cpp\ffmpeg-cpp.vcxproj">
-      <Project>{babfd64d-9bf1-4328-b977-24bf81800620}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="GeneratedAudioSource.h" />
-    <ClInclude Include="GeneratedVideoSource.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/demo/demo.vcxproj.filters b/source/ffmpeg-cpp/demo/demo.vcxproj.filters
deleted file mode 100644
index ff353b2..0000000
--- a/source/ffmpeg-cpp/demo/demo.vcxproj.filters
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="demo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GeneratedVideoSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GeneratedAudioSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="GeneratedVideoSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GeneratedAudioSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/demo/demo.vcxproj.user b/source/ffmpeg-cpp/demo/demo.vcxproj.user
deleted file mode 100644
index 6c84d89..0000000
--- a/source/ffmpeg-cpp/demo/demo.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj b/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj
deleted file mode 100644
index 434460a..0000000
--- a/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>decodeaudio</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="encode_audio.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ffmpeg-cpp\ffmpeg-cpp.vcxproj">
-      <Project>{babfd64d-9bf1-4328-b977-24bf81800620}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj.filters b/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj.filters
deleted file mode 100644
index ae624bc..0000000
--- a/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="encode_audio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj.user b/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj.user
deleted file mode 100644
index 6c84d89..0000000
--- a/source/ffmpeg-cpp/encode_audio/encode_audio.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/encode_video/encode_video.vcxproj b/source/ffmpeg-cpp/encode_video/encode_video.vcxproj
deleted file mode 100644
index e9c6d00..0000000
--- a/source/ffmpeg-cpp/encode_video/encode_video.vcxproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>decodeaudio</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ffmpeg-cpp\ffmpeg-cpp.vcxproj">
-      <Project>{babfd64d-9bf1-4328-b977-24bf81800620}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="encode_video.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/encode_video/encode_video.vcxproj.filters b/source/ffmpeg-cpp/encode_video/encode_video.vcxproj.filters
deleted file mode 100644
index c863a03..0000000
--- a/source/ffmpeg-cpp/encode_video/encode_video.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="encode_video.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/encode_video/encode_video.vcxproj.user b/source/ffmpeg-cpp/encode_video/encode_video.vcxproj.user
deleted file mode 100644
index 6c84d89..0000000
--- a/source/ffmpeg-cpp/encode_video/encode_video.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp.sln b/source/ffmpeg-cpp/ffmpeg-cpp.sln
deleted file mode 100644
index 99292a3..0000000
--- a/source/ffmpeg-cpp/ffmpeg-cpp.sln
+++ /dev/null
@@ -1,281 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.106
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo", "demo\demo.vcxproj", "{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg-cpp", "ffmpeg-cpp\ffmpeg-cpp.vcxproj", "{BABFD64D-9BF1-4328-B977-24BF81800620}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{3B1FE419-D7D2-4406-9C24-5A6F6ED63E73}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decode_audio", "decode_audio\decode_audio.vcxproj", "{C6101E18-D73B-430C-A79C-084E1236EA94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decode_video", "decode_video\decode_video.vcxproj", "{AAD3AB93-F831-4339-8AAD-DC956B9B9233}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encode_audio", "encode_audio\encode_audio.vcxproj", "{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encode_video", "encode_video\encode_video.vcxproj", "{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remuxing", "remuxing\remuxing.vcxproj", "{B337D322-355B-4348-A2A8-270471BE2C95}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filtering_video", "filtering_video\filtering_video.vcxproj", "{80579A29-8073-46A0-B328-661155E0887B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		DebugDLL|x64 = DebugDLL|x64
-		DebugDLL|x86 = DebugDLL|x86
-		DebugDLLStaticDeps|x64 = DebugDLLStaticDeps|x64
-		DebugDLLStaticDeps|x86 = DebugDLLStaticDeps|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-		ReleaseDLL|x64 = ReleaseDLL|x64
-		ReleaseDLL|x86 = ReleaseDLL|x86
-		ReleaseDLLStaticDeps|x64 = ReleaseDLLStaticDeps|x64
-		ReleaseDLLStaticDeps|x86 = ReleaseDLLStaticDeps|x86
-		ReleaseLTO|x64 = ReleaseLTO|x64
-		ReleaseLTO|x86 = ReleaseLTO|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Debug|x64.ActiveCfg = Debug|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Debug|x64.Build.0 = Debug|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Debug|x86.ActiveCfg = Debug|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Debug|x86.Build.0 = Debug|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLL|x64.Build.0 = Debug|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLL|x86.Build.0 = Debug|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Release|x64.ActiveCfg = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Release|x64.Build.0 = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Release|x86.ActiveCfg = Release|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.Release|x86.Build.0 = Release|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLL|x64.Build.0 = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseLTO|x64.Build.0 = Release|x64
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{D8377B20-EEFC-4ABC-95F0-24BC86B7E3F2}.ReleaseLTO|x86.Build.0 = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Debug|x64.ActiveCfg = Debug|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Debug|x64.Build.0 = Debug|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Debug|x86.ActiveCfg = Debug|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Debug|x86.Build.0 = Debug|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLL|x64.Build.0 = Debug|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLL|x86.Build.0 = Debug|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Release|x64.ActiveCfg = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Release|x64.Build.0 = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Release|x86.ActiveCfg = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.Release|x86.Build.0 = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLL|x64.Build.0 = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseLTO|x64.Build.0 = Release|x64
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{BABFD64D-9BF1-4328-B977-24BF81800620}.ReleaseLTO|x86.Build.0 = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Debug|x64.ActiveCfg = Debug|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Debug|x64.Build.0 = Debug|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Debug|x86.ActiveCfg = Debug|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Debug|x86.Build.0 = Debug|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLL|x64.Build.0 = Debug|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLL|x86.Build.0 = Debug|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Release|x64.ActiveCfg = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Release|x64.Build.0 = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Release|x86.ActiveCfg = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.Release|x86.Build.0 = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLL|x64.Build.0 = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseLTO|x64.Build.0 = Release|x64
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{C6101E18-D73B-430C-A79C-084E1236EA94}.ReleaseLTO|x86.Build.0 = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Debug|x64.ActiveCfg = Debug|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Debug|x64.Build.0 = Debug|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Debug|x86.ActiveCfg = Debug|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Debug|x86.Build.0 = Debug|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLL|x64.Build.0 = Debug|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLL|x86.Build.0 = Debug|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Release|x64.ActiveCfg = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Release|x64.Build.0 = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Release|x86.ActiveCfg = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.Release|x86.Build.0 = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLL|x64.Build.0 = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseLTO|x64.Build.0 = Release|x64
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233}.ReleaseLTO|x86.Build.0 = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Debug|x64.ActiveCfg = Debug|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Debug|x64.Build.0 = Debug|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Debug|x86.ActiveCfg = Debug|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Debug|x86.Build.0 = Debug|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLL|x64.Build.0 = Debug|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLL|x86.Build.0 = Debug|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Release|x64.ActiveCfg = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Release|x64.Build.0 = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Release|x86.ActiveCfg = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.Release|x86.Build.0 = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLL|x64.Build.0 = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseLTO|x64.Build.0 = Release|x64
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6}.ReleaseLTO|x86.Build.0 = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Debug|x64.ActiveCfg = Debug|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Debug|x64.Build.0 = Debug|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Debug|x86.ActiveCfg = Debug|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Debug|x86.Build.0 = Debug|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLL|x64.Build.0 = Debug|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLL|x86.Build.0 = Debug|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Release|x64.ActiveCfg = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Release|x64.Build.0 = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Release|x86.ActiveCfg = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.Release|x86.Build.0 = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLL|x64.Build.0 = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseLTO|x64.Build.0 = Release|x64
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3}.ReleaseLTO|x86.Build.0 = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Debug|x64.ActiveCfg = Debug|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Debug|x64.Build.0 = Debug|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Debug|x86.ActiveCfg = Debug|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Debug|x86.Build.0 = Debug|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLL|x64.Build.0 = Debug|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLL|x86.Build.0 = Debug|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Release|x64.ActiveCfg = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Release|x64.Build.0 = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Release|x86.ActiveCfg = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.Release|x86.Build.0 = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLL|x64.Build.0 = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseLTO|x64.Build.0 = Release|x64
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{B337D322-355B-4348-A2A8-270471BE2C95}.ReleaseLTO|x86.Build.0 = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.Debug|x64.ActiveCfg = Debug|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.Debug|x64.Build.0 = Debug|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.Debug|x86.ActiveCfg = Debug|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.Debug|x86.Build.0 = Debug|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLL|x64.ActiveCfg = Debug|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLL|x64.Build.0 = Debug|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLL|x86.ActiveCfg = Debug|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLL|x86.Build.0 = Debug|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.Release|x64.ActiveCfg = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.Release|x64.Build.0 = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.Release|x86.ActiveCfg = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.Release|x86.Build.0 = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLL|x64.Build.0 = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLL|x86.ActiveCfg = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLL|x86.Build.0 = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseLTO|x64.ActiveCfg = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseLTO|x64.Build.0 = Release|x64
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseLTO|x86.ActiveCfg = Release|Win32
-		{80579A29-8073-46A0-B328-661155E0887B}.ReleaseLTO|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C6101E18-D73B-430C-A79C-084E1236EA94} = {3B1FE419-D7D2-4406-9C24-5A6F6ED63E73}
-		{AAD3AB93-F831-4339-8AAD-DC956B9B9233} = {3B1FE419-D7D2-4406-9C24-5A6F6ED63E73}
-		{9D936BE4-46AA-489F-82E7-D2CFEB157FB6} = {3B1FE419-D7D2-4406-9C24-5A6F6ED63E73}
-		{597D5EF8-04DB-48F9-A8F3-4B593B81C7C3} = {3B1FE419-D7D2-4406-9C24-5A6F6ED63E73}
-		{B337D322-355B-4348-A2A8-270471BE2C95} = {3B1FE419-D7D2-4406-9C24-5A6F6ED63E73}
-		{80579A29-8073-46A0-B328-661155E0887B} = {3B1FE419-D7D2-4406-9C24-5A6F6ED63E73}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1838F09B-B929-4D1E-ABB6-FA2A94F4A4BE}
-	EndGlobalSection
-EndGlobal
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj b/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj
deleted file mode 100644
index fed6ac2..0000000
--- a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{BABFD64D-9BF1-4328-B977-24BF81800620}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ffmpegcpp</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <SpectreMitigation>false</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;$(FFmpegLibraryDir)lib</LibraryPath>
-    <OutDir>$(ProjectDir)..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86;$(FFmpegLibraryDir)lib</LibraryPath>
-    <OutDir>$(ProjectDir)..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib</AdditionalDependencies>
-    </Lib>
-    <PostBuildEvent>
-      <Command>xcopy $(ProjectDir)*.h $(ProjectDir)..\..\..\include /y /s /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib</AdditionalDependencies>
-    </Lib>
-    <PostBuildEvent>
-      <Command>xcopy $(ProjectDir)*.h $(ProjectDir)..\..\..\include /y /s</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib</AdditionalDependencies>
-    </Lib>
-    <PostBuildEvent>
-      <Command>xcopy $(ProjectDir)*.h $(ProjectDir)..\..\..\include /y /s</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>$(FFmpegLibraryDir)lib\avcodec.lib;$(FFmpegLibraryDir)lib\avfilter.lib;$(FFmpegLibraryDir)lib\avformat.lib;$(FFmpegLibraryDir)lib\avutil.lib;$(FFmpegLibraryDir)lib\swresample.lib;$(FFmpegLibraryDir)lib\swscale.lib</AdditionalDependencies>
-    </Lib>
-    <PostBuildEvent>
-      <Command>xcopy $(ProjectDir)*.h $(ProjectDir)..\..\..\include /y /s</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Sources\EncodedFileSource.h" />
-    <ClInclude Include="Sources\RawVideoFileSource.h" />
-    <ClInclude Include="Sources\RawAudioFileSource.h" />
-    <ClInclude Include="Sources\RawAudioDataSource.h" />
-    <ClInclude Include="Sources\InputSource.h" />
-    <ClInclude Include="Demuxing\InputStream.h" />
-    <ClInclude Include="Demuxing\AudioInputStream.h" />
-    <ClInclude Include="Sources\Demuxer.h" />
-    <ClInclude Include="Frame Sinks\AudioFrameSink.h" />
-    <ClInclude Include="Frame Sinks\AudioEncoder.h" />
-    <ClInclude Include="Muxing\AudioOutputStream.h" />
-    <ClInclude Include="Codecs\AudioCodec.h" />
-    <ClInclude Include="ffmpegcpp.h" />
-    <ClInclude Include="Frame Sinks\VideoFilter.h" />
-    <ClInclude Include="Codecs\JPGCodec.h" />
-    <ClInclude Include="OpenCodec.h" />
-    <ClInclude Include="Codecs\PNGCodec.h" />
-    <ClInclude Include="Sources\RawVideoDataSource.h" />
-    <ClInclude Include="Codecs\Codec.h" />
-    <ClInclude Include="CodecDeducer.h" />
-    <ClInclude Include="Frame Sinks\VideoEncoder.h" />
-    <ClInclude Include="ffmpeg.h" />
-    <ClInclude Include="FFmpegException.h" />
-    <ClInclude Include="Codecs\H264NVEncCodec.h" />
-    <ClInclude Include="Codecs\H265NVEncCodec.h" />
-    <ClInclude Include="Frame Sinks\FrameSink.h" />
-    <ClInclude Include="Muxing\Muxer.h" />
-    <ClInclude Include="Muxing\OutputStream.h" />
-    <ClInclude Include="std.h" />
-    <ClInclude Include="Codecs\VideoCodec.h" />
-    <ClInclude Include="Codecs\VP9Codec.h" />
-    <ClInclude Include="Frame Sinks\VideoFrameSink.h" />
-    <ClInclude Include="Demuxing\VideoInputStream.h" />
-    <ClInclude Include="AudioFormatConverter.h" />
-    <ClInclude Include="ConvertedAudioProcessor.h" />
-    <ClInclude Include="VideoFormatConverter.h" />
-    <ClInclude Include="Muxing\VideoOutputStream.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Demuxing\InputStream.cpp" />
-    <ClCompile Include="Demuxing\AudioInputStream.cpp" />
-    <ClCompile Include="Sources\EncodedFileSource.cpp" />
-    <ClCompile Include="Sources\RawVideoFileSource.cpp" />
-    <ClCompile Include="Sources\RawAudioFileSource.cpp" />
-    <ClCompile Include="Sources\RawAudioDataSource.cpp" />
-    <ClCompile Include="Sources\Demuxer.cpp" />
-    <ClCompile Include="Frame Sinks\AudioEncoder.cpp" />
-    <ClCompile Include="Muxing\AudioOutputStream.cpp" />
-    <ClCompile Include="Codecs\AudioCodec.cpp" />
-    <ClCompile Include="Frame Sinks\VideoFilter.cpp" />
-    <ClCompile Include="Codecs\JPGCodec.cpp" />
-    <ClCompile Include="OpenCodec.cpp" />
-    <ClCompile Include="Codecs\PNGCodec.cpp" />
-    <ClCompile Include="Sources\RawVideoDataSource.cpp" />
-    <ClCompile Include="Codecs\Codec.cpp" />
-    <ClCompile Include="CodecDeducer.cpp" />
-    <ClCompile Include="Frame Sinks\VideoEncoder.cpp" />
-    <ClCompile Include="FFmpegException.cpp" />
-    <ClCompile Include="Codecs\H264NVEncCodec.cpp" />
-    <ClCompile Include="Codecs\H265NVEncCodec.cpp" />
-    <ClCompile Include="Muxing\Muxer.cpp" />
-    <ClCompile Include="Muxing\OutputStream.cpp" />
-    <ClCompile Include="Codecs\VideoCodec.cpp" />
-    <ClCompile Include="Codecs\VP9Codec.cpp" />
-    <ClCompile Include="Demuxing\VideoInputStream.cpp" />
-    <ClCompile Include="AudioFormatConverter.cpp" />
-    <ClCompile Include="VideoFormatConverter.cpp" />
-    <ClCompile Include="Muxing\VideoOutputStream.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj.filters b/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj.filters
deleted file mode 100644
index e88632f..0000000
--- a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj.filters
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ffmpeg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="std.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FFmpegException.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CodecDeducer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ffmpegcpp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenCodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\H264NVEncCodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\H265NVEncCodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\VP9Codec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Frame Sinks\FrameSink.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\VideoCodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\Codec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Frame Sinks\VideoFilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\PNGCodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\JPGCodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs\AudioCodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Frame Sinks\AudioEncoder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Frame Sinks\AudioFrameSink.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Frame Sinks\VideoFrameSink.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Frame Sinks\VideoEncoder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AudioFormatConverter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ConvertedAudioProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sources\InputSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sources\RawVideoDataSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Demuxing\InputStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Demuxing\AudioInputStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Demuxing\VideoInputStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sources\Demuxer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sources\RawAudioDataSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sources\RawAudioFileSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sources\RawVideoFileSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VideoFormatConverter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Muxing\AudioOutputStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Muxing\VideoOutputStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Muxing\OutputStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Muxing\Muxer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sources\EncodedFileSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="FFmpegException.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CodecDeducer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenCodec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\H264NVEncCodec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\H265NVEncCodec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\VP9Codec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\VideoCodec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\Codec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Frame Sinks\VideoFilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\PNGCodec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\JPGCodec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs\AudioCodec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Frame Sinks\AudioEncoder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Frame Sinks\VideoEncoder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AudioFormatConverter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sources\RawVideoDataSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Demuxing\InputStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Demuxing\AudioInputStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Demuxing\VideoInputStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sources\Demuxer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sources\RawAudioDataSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sources\RawAudioFileSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sources\RawVideoFileSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VideoFormatConverter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Muxing\AudioOutputStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Muxing\VideoOutputStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Muxing\OutputStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Muxing\Muxer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sources\EncodedFileSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj.user b/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj.user
deleted file mode 100644
index 0b0f24d..0000000
--- a/source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ShowAllFiles>true</ShowAllFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj b/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj
deleted file mode 100644
index 4362b9a..0000000
--- a/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{80579A29-8073-46A0-B328-661155E0887B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>decodeaudio</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ffmpeg-cpp\ffmpeg-cpp.vcxproj">
-      <Project>{babfd64d-9bf1-4328-b977-24bf81800620}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="filtering_video.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj.filters b/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj.filters
deleted file mode 100644
index b1ed7c9..0000000
--- a/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="filtering_video.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj.user b/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj.user
deleted file mode 100644
index 6c84d89..0000000
--- a/source/ffmpeg-cpp/filtering_video/filtering_video.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/remuxing/remuxing.vcxproj b/source/ffmpeg-cpp/remuxing/remuxing.vcxproj
deleted file mode 100644
index c45c067..0000000
--- a/source/ffmpeg-cpp/remuxing/remuxing.vcxproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{B337D322-355B-4348-A2A8-270471BE2C95}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>decodeaudio</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\FFmpegLibraryLocationProperty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FFmpegLibraryDir)include;..\ffmpeg-cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy $(SamplesDir) $(OutDir)samples /s /y /i
-xcopy $(FFmpegLibraryDir)bin $(OutDir) /s /y /i</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ffmpeg-cpp\ffmpeg-cpp.vcxproj">
-      <Project>{babfd64d-9bf1-4328-b977-24bf81800620}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="remuxing.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/remuxing/remuxing.vcxproj.filters b/source/ffmpeg-cpp/remuxing/remuxing.vcxproj.filters
deleted file mode 100644
index de7d8a5..0000000
--- a/source/ffmpeg-cpp/remuxing/remuxing.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="remuxing.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/remuxing/remuxing.vcxproj.user b/source/ffmpeg-cpp/remuxing/remuxing.vcxproj.user
deleted file mode 100644
index be25078..0000000
--- a/source/ffmpeg-cpp/remuxing/remuxing.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/AudioFormatConverter.cpp b/src/AudioFormatConverter.cpp
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/AudioFormatConverter.cpp
rename to src/AudioFormatConverter.cpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/CodecDeducer.cpp b/src/CodecDeducer.cpp
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/CodecDeducer.cpp
rename to src/CodecDeducer.cpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.cpp b/src/Codecs/AudioCodec.cpp
similarity index 99%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.cpp
rename to src/Codecs/AudioCodec.cpp
index 3d18e0c..8e931a6 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/AudioCodec.cpp
+++ b/src/Codecs/AudioCodec.cpp
@@ -1,4 +1,4 @@
-#include "AudioCodec.h"
+#include "Codecs/AudioCodec.h"
 #include "FFmpegException.h"
 
 using namespace std;
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/Codec.cpp b/src/Codecs/Codec.cpp
similarity index 98%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/Codec.cpp
rename to src/Codecs/Codec.cpp
index 8b44c97..6488b75 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/Codec.cpp
+++ b/src/Codecs/Codec.cpp
@@ -1,4 +1,4 @@
-#include "Codec.h"
+#include "Codecs/Codec.h"
 #include "FFmpegException.h"
 #include "CodecDeducer.h"
 
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/codecs/H264NVEncCodec.cpp b/src/Codecs/H264NVEncCodec.cpp
similarity index 84%
rename from source/ffmpeg-cpp/ffmpeg-cpp/codecs/H264NVEncCodec.cpp
rename to src/Codecs/H264NVEncCodec.cpp
index 424c6b1..fb86719 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/codecs/H264NVEncCodec.cpp
+++ b/src/Codecs/H264NVEncCodec.cpp
@@ -1,4 +1,4 @@
-#include "H264NVEncCodec.h"
+#include "Codecs/H264NVEncCodec.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/codecs/H265NVEncCodec.cpp b/src/Codecs/H265NVEncCodec.cpp
similarity index 84%
rename from source/ffmpeg-cpp/ffmpeg-cpp/codecs/H265NVEncCodec.cpp
rename to src/Codecs/H265NVEncCodec.cpp
index 31c55f2..bfc3470 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/codecs/H265NVEncCodec.cpp
+++ b/src/Codecs/H265NVEncCodec.cpp
@@ -1,4 +1,4 @@
-#include "H265NVEncCodec.h"
+#include "Codecs/H265NVEncCodec.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/JPGCodec.cpp b/src/Codecs/JPGCodec.cpp
similarity index 91%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/JPGCodec.cpp
rename to src/Codecs/JPGCodec.cpp
index 6431dd5..f695dc1 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/JPGCodec.cpp
+++ b/src/Codecs/JPGCodec.cpp
@@ -1,4 +1,4 @@
-#include "JPGCodec.h"
+#include "Codecs/JPGCodec.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/PNGCodec.cpp b/src/Codecs/PNGCodec.cpp
similarity index 91%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/PNGCodec.cpp
rename to src/Codecs/PNGCodec.cpp
index ff0f522..173c2e1 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/PNGCodec.cpp
+++ b/src/Codecs/PNGCodec.cpp
@@ -1,4 +1,4 @@
-#include "PNGCodec.h"
+#include "Codecs/PNGCodec.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VP9Codec.cpp b/src/Codecs/VP9Codec.cpp
similarity index 93%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VP9Codec.cpp
rename to src/Codecs/VP9Codec.cpp
index 1497525..a4e10c9 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VP9Codec.cpp
+++ b/src/Codecs/VP9Codec.cpp
@@ -1,4 +1,4 @@
-#include "VP9Codec.h"
+#include "Codecs/VP9Codec.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VideoCodec.cpp b/src/Codecs/VideoCodec.cpp
similarity index 99%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VideoCodec.cpp
rename to src/Codecs/VideoCodec.cpp
index c166957..7499261 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Codecs/VideoCodec.cpp
+++ b/src/Codecs/VideoCodec.cpp
@@ -1,4 +1,4 @@
-#include "VideoCodec.h"
+#include "Codecs/VideoCodec.h"
 #include "FFmpegException.h"
 
 using namespace std;
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/AudioInputStream.cpp b/src/Demuxing/AudioInputStream.cpp
similarity index 92%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/AudioInputStream.cpp
rename to src/Demuxing/AudioInputStream.cpp
index 0674174..037bc99 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/AudioInputStream.cpp
+++ b/src/Demuxing/AudioInputStream.cpp
@@ -1,4 +1,4 @@
-#include "AudioInputStream.h"
+#include "Demuxing/AudioInputStream.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/InputStream.cpp b/src/Demuxing/InputStream.cpp
similarity index 99%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/InputStream.cpp
rename to src/Demuxing/InputStream.cpp
index 6fbe39c..91c9d7f 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/InputStream.cpp
+++ b/src/Demuxing/InputStream.cpp
@@ -1,4 +1,4 @@
-#include "InputStream.h"
+#include "Demuxing/InputStream.h"
 #include "CodecDeducer.h"
 #include "FFmpegException.h"
 
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/VideoInputStream.cpp b/src/Demuxing/VideoInputStream.cpp
similarity index 87%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/VideoInputStream.cpp
rename to src/Demuxing/VideoInputStream.cpp
index d1facae..241d04a 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/VideoInputStream.cpp
+++ b/src/Demuxing/VideoInputStream.cpp
@@ -1,4 +1,4 @@
-#include "VideoInputStream.h"
+#include "Demuxing/VideoInputStream.h"
 
 namespace ffmpegcpp
 {
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/FFmpegException.cpp b/src/FFmpegException.cpp
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/FFmpegException.cpp
rename to src/FFmpegException.cpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.cpp b/src/FrameSinks/AudioEncoder.cpp
similarity index 98%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.cpp
rename to src/FrameSinks/AudioEncoder.cpp
index 4220afb..e5d69aa 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/AudioEncoder.cpp	
+++ b/src/FrameSinks/AudioEncoder.cpp
@@ -1,4 +1,4 @@
-#include "AudioEncoder.h"
+#include "FrameSinks/AudioEncoder.h"
 #include "Muxing/AudioOutputStream.h"
 
 #include "FFmpegException.h"
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.cpp b/src/FrameSinks/VideoEncoder.cpp
similarity index 99%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.cpp
rename to src/FrameSinks/VideoEncoder.cpp
index 9d52254..d66a0b0 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoEncoder.cpp	
+++ b/src/FrameSinks/VideoEncoder.cpp
@@ -1,4 +1,4 @@
-#include "VideoEncoder.h"
+#include "FrameSinks/VideoEncoder.h"
 
 #include "FFmpegException.h"
 #include "Muxing/VideoOutputStream.h"
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.cpp b/src/FrameSinks/VideoFilter.cpp
similarity index 99%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.cpp
rename to src/FrameSinks/VideoFilter.cpp
index 2a599c8..6562aa5 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/VideoFilter.cpp	
+++ b/src/FrameSinks/VideoFilter.cpp
@@ -1,4 +1,4 @@
-#include "VideoFilter.h"
+#include "FrameSinks/VideoFilter.h"
 #include "FFmpegException.h"
 
 namespace ffmpegcpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/AudioOutputStream.cpp b/src/Muxing/AudioOutputStream.cpp
similarity index 98%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/AudioOutputStream.cpp
rename to src/Muxing/AudioOutputStream.cpp
index b79c564..cdb5e20 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/AudioOutputStream.cpp
+++ b/src/Muxing/AudioOutputStream.cpp
@@ -1,4 +1,4 @@
-#include "AudioOutputStream.h"
+#include "Muxing/AudioOutputStream.h"
 #include "FFmpegException.h"
 
 using namespace std;
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.cpp b/src/Muxing/Muxer.cpp
similarity index 98%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.cpp
rename to src/Muxing/Muxer.cpp
index 2135608..2db072a 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.cpp
+++ b/src/Muxing/Muxer.cpp
@@ -1,6 +1,6 @@
-#include "Muxer.h"
+#include "Muxing/Muxer.h"
 #include "FFmpegException.h"
-#include "OutputStream.h"
+#include "Muxing/OutputStream.h"
 
 #include <string>
 
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.cpp b/src/Muxing/OutputStream.cpp
similarity index 97%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.cpp
rename to src/Muxing/OutputStream.cpp
index 8e1bfa9..373fdaf 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/OutputStream.cpp
+++ b/src/Muxing/OutputStream.cpp
@@ -1,4 +1,4 @@
-#include "OutputStream.h"
+#include "Muxing/OutputStream.h"
 #include "FFmpegException.h"
 
 using namespace std;
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/VideoOutputStream.cpp b/src/Muxing/VideoOutputStream.cpp
similarity index 98%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Muxing/VideoOutputStream.cpp
rename to src/Muxing/VideoOutputStream.cpp
index 5a555a4..ae86a5b 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/VideoOutputStream.cpp
+++ b/src/Muxing/VideoOutputStream.cpp
@@ -1,4 +1,4 @@
-#include "VideoOutputStream.h"
+#include "Muxing/VideoOutputStream.h"
 #include "FFmpegException.h"
 
 using namespace std;
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/OpenCodec.cpp b/src/OpenCodec.cpp
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/OpenCodec.cpp
rename to src/OpenCodec.cpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.cpp b/src/Sources/Demuxer.cpp
similarity index 99%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.cpp
rename to src/Sources/Demuxer.cpp
index 8f157eb..d489a1d 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.cpp
+++ b/src/Sources/Demuxer.cpp
@@ -1,4 +1,4 @@
-#include "Demuxer.h"
+#include "Sources/Demuxer.h"
 #include "FFmpegException.h"
 #include "CodecDeducer.h"
 
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/EncodedFileSource.cpp b/src/Sources/EncodedFileSource.cpp
similarity index 99%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/EncodedFileSource.cpp
rename to src/Sources/EncodedFileSource.cpp
index 88ccd43..3f5aba1 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/EncodedFileSource.cpp
+++ b/src/Sources/EncodedFileSource.cpp
@@ -1,4 +1,4 @@
-#include "EncodedFileSource.h"
+#include "Sources/EncodedFileSource.h"
 #include "FFmpegException.h"
 #include "CodecDeducer.h"
 
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioDataSource.cpp b/src/Sources/RawAudioDataSource.cpp
similarity index 97%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioDataSource.cpp
rename to src/Sources/RawAudioDataSource.cpp
index 3354795..512a718 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioDataSource.cpp
+++ b/src/Sources/RawAudioDataSource.cpp
@@ -1,4 +1,4 @@
-#include "RawAudioDataSource.h"
+#include "Sources/RawAudioDataSource.h"
 #include "FFmpegException.h"
 
 namespace ffmpegcpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioFileSource.cpp b/src/Sources/RawAudioFileSource.cpp
similarity index 96%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioFileSource.cpp
rename to src/Sources/RawAudioFileSource.cpp
index 6b55509..71a5a6a 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawAudioFileSource.cpp
+++ b/src/Sources/RawAudioFileSource.cpp
@@ -1,4 +1,4 @@
-#include "RawAudioFileSource.h"
+#include "Sources/RawAudioFileSource.h"
 #include "FFmpegException.h"
 #include "std.h"
 
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoDataSource.cpp b/src/Sources/RawVideoDataSource.cpp
similarity index 98%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoDataSource.cpp
rename to src/Sources/RawVideoDataSource.cpp
index ee199b6..15e127e 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoDataSource.cpp
+++ b/src/Sources/RawVideoDataSource.cpp
@@ -1,4 +1,4 @@
-#include "RawVideoDataSource.h"
+#include "Sources/RawVideoDataSource.h"
 #include "FFmpegException.h"
 
 namespace ffmpegcpp
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoFileSource.cpp b/src/Sources/RawVideoFileSource.cpp
similarity index 98%
rename from source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoFileSource.cpp
rename to src/Sources/RawVideoFileSource.cpp
index 28c0d95..4b56f96 100644
--- a/source/ffmpeg-cpp/ffmpeg-cpp/Sources/RawVideoFileSource.cpp
+++ b/src/Sources/RawVideoFileSource.cpp
@@ -1,4 +1,4 @@
-#include "RawVideoFileSource.h"
+#include "Sources/RawVideoFileSource.h"
 #include "FFmpegException.h"
 #include "std.h"
 
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/VideoFormatConverter.cpp b/src/VideoFormatConverter.cpp
similarity index 100%
rename from source/ffmpeg-cpp/ffmpeg-cpp/VideoFormatConverter.cpp
rename to src/VideoFormatConverter.cpp