Merge pull request #615 from delroth/libav-ubuntu

Change libav* autodetection to support framedumping on Ubuntu 14.04
This commit is contained in:
Pierre Bourdon 2014-07-13 23:22:45 +02:00
commit 0c95fcf918
2 changed files with 7 additions and 2 deletions

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()

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;