diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-13 23:22:45 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-13 23:22:45 +0200 |
| commit | 0c95fcf9182dd0e90d4eec8b5fb12d03a316ba6a (patch) | |
| tree | 89cb4fa62699e94d46738b1a7b847c5016dd40e6 /Source/Core | |
| parent | 3cabacde9d8be9aa0b250d3df5ec09e056f963bf (diff) | |
| parent | 8876ee120a9091441c8b2e280920cf6dbe748bca (diff) | |
Merge pull request #615 from delroth/libav-ubuntu
Change libav* autodetection to support framedumping on Ubuntu 14.04
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoCommon/AVIDump.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index 15ffab639a..850868d54e 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -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; |