Attachment #316911 for bug #276338

View | Details | Raw Unified | Return to bug 276338 | Differences between

and this patch

Lines 44-49 Link Here

(-)source/blender/blenkernel/intern/writeffmpeg.c (+2 lines)
44	#include <libavutil/rational.h>	44	#include <libavutil/rational.h>
45	#include <libavutil/samplefmt.h>	45	#include <libavutil/samplefmt.h>
46	#include <libswscale/swscale.h>	46	#include <libswscale/swscale.h>
		47	#include <libavutil/mathematics.h>
		48	#include <libavutil/avstring.h>
47		49
48	#include "MEM_guardedalloc.h"	50	#include "MEM_guardedalloc.h"
49		51

Lines 36-41 Link Here

(-)intern/ffmpeg/ffmpeg_compat.h (+1 lines)
36	#include <libavcodec/avcodec.h>	36	#include <libavcodec/avcodec.h>
37	#include <libavutil/rational.h>	37	#include <libavutil/rational.h>
38	#include <libavutil/opt.h>	38	#include <libavutil/opt.h>
		39	#include <libavutil/mathematics.h>
39		40
40	#if (LIBAVFORMAT_VERSION_MAJOR > 52) \|\| ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))	41	#if (LIBAVFORMAT_VERSION_MAJOR > 52) \|\| ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
41	#define FFMPEG_HAVE_PARSE_UTILS 1	42	#define FFMPEG_HAVE_PARSE_UTILS 1

Lines 40-45 Link Here

(-)intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp (-3 / +10 lines)
40	#include <libavcodec/avcodec.h>	40	#include <libavcodec/avcodec.h>
41	#include <libavformat/avformat.h>	41	#include <libavformat/avformat.h>
42	#include <libavformat/avio.h>	42	#include <libavformat/avio.h>
		43	#include <libavutil/mathematics.h>
		44	#include <libavutil/avstring.h>
43	#include "ffmpeg_compat.h"	45	#include "ffmpeg_compat.h"
44	}	46	}
45		47
Lines 57-66 Link Here
57	{	58	{
58	static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };	59	static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };
59		60
60	if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str()))	61	m_formatCtx = avformat_alloc_context();
61	AUD_THROW(AUD_ERROR_FFMPEG, context_error);	62	if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
62		63
63	m_outputFmt = m_formatCtx->oformat;	64	av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename));
		65	m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
		66	if (!m_outputFmt) {
		67	avformat_free_context(m_formatCtx);
		68	AUD_THROW(AUD_ERROR_FFMPEG, context_error);
		69	}
64		70
65	switch(codec)	71	switch(codec)
66	{	72	{

Return to bug 276338