archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change libav* autodetection to support framedumping on Ubuntu 14.04

Browse source 
Add an "ugly" workaround in the AVIDump code, but looking at other project this
seems to be the most common way to handle this API change.
This commit is contained in:
Pierre Bourdon 2014-07-13 23:06:20 +02:00
parent 3cabacde9d
commit 8876ee120a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeTests/CheckLib.cmake
View file

@ -55,8 +55,8 @@ endmacro()
macro(check_libav)
if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBAV libavcodec>=55.52.102 libavformat>=55.33.100
libswscale>=2.5.102 libavutil>=52.66.100)
pkg_check_modules(LIBAV libavcodec>=54.35.0 libavformat>=54.20.4
libswscale>=2.1.1 libavutil>=52.3.0)
else()
message("pkg-config is required to check for libav/ffmpeg")
endif()

5
Source/Core/VideoCommon/AVIDump.cpp
View file

@ -215,6 +215,11 @@ extern "C" {
#include <libavutil/mathematics.h>
}
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
#define av_frame_alloc avcodec_alloc_frame
#define av_frame_free avcodec_free_frame
#endif
static AVFormatContext* s_format_context = nullptr;
static AVStream* s_stream = nullptr;
static AVFrame* s_src_frame = nullptr;