From 0b03785eb5d46dfc053d7f8ef4924219fe7759c5 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 16 Feb 2016 12:32:42 +0100 Subject: Make Blender compilable with FFmpeg-3.0 While it's not something we'll be using for the official release, it's nice to support new libraries at least on "it compiles" level, so it's not that many frustrated developers around. Nexyon, please have a look into Audaspace changes :) --- intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp') diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp index ff2c526bf49..e9eea195208 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp @@ -58,9 +58,9 @@ int AUD_FFMPEGReader::decode(AVPacket& packet, AUD_Buffer& buffer) got_frame = 0; if(!frame) - frame = avcodec_alloc_frame(); + frame = av_frame_alloc(); else - avcodec_get_frame_defaults(frame); + av_frame_unref(frame); read_length = avcodec_decode_audio4(m_codecCtx, frame, &got_frame, &packet); if(read_length < 0) -- cgit v1.2.3