Skip to content
Permalink
Browse files

Fix video/audio recording.

We create a namespace to deal with most of our recording solution.

Besides that, we also add some functions to remove the need of
including libavutil headers on other part of the code. This is meant to
isolate most of recording solution components on the proper files.

We will start with a limited number of codecs supported; slowly we
should add them as they are tested (the previous one did not work for
most codecs listed).

This should support `ffmpeg 4.1` and further, including removing
all compilation warnings related to versions discrepancy.
  • Loading branch information
denisfa authored and rkitover committed Jul 22, 2019
1 parent cfb03d8 commit 5848feaea2e6edde95bc1e511211ceb756622b04
Showing with 677 additions and 656 deletions.
  1. +3 −3 CMakeLists.txt
  2. +557 −553 src/common/ffmpeg.cpp
  3. +72 −34 src/common/ffmpeg.h
  4. +16 −37 src/wx/cmdevents.cpp
  5. +27 −27 src/wx/panel.cpp
  6. +2 −2 src/wx/wxvbam.h
@@ -280,7 +280,7 @@ set(
if(ENABLE_FFMPEG)
find_package(PkgConfig REQUIRED)

pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libswscale libavutil)
pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libswscale libavutil libswresample)

if(FFMPEG_STATIC)
set(FFMPEG_LIBRARIES ${FFMPEG_STATIC_LIBRARIES})
@@ -625,7 +625,7 @@ set(
)

if(MSVC)
set(SRC_MAIN ${SRC_MAIN} "dependencies/msvc/getopt.c")
set(SRC_MAIN ${SRC_MAIN} "dependencies/msvc/getopt.c")
endif()

set(
@@ -643,7 +643,7 @@ set(
)

if(MSVC)
set(HDR_MAIN ${HDR_MAIN} "dependencies/msvc/getopt.h")
set(HDR_MAIN ${HDR_MAIN} "dependencies/msvc/getopt.h")
endif()

if(ENABLE_FFMPEG)

0 comments on commit 5848fea

Please sign in to comment.
You can’t perform that action at this time.