Created
July 10, 2018 11:17
-
-
Save jesvs/d6a8d861b5e665919fadfb57183cdbb6 to your computer and use it in GitHub Desktop.
Blender 2.79 ffmpeg 4.0.1 patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2018-07-10 02:29:54.725788354 -0600 | |
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2018-07-10 02:31:17.070473241 -0600 | |
@@ -264,9 +264,9 @@ | |
m_membuffer(buffer), | |
m_membufferpos(0) | |
{ | |
- m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)); | |
+ m_membuf = reinterpret_cast<data_t*>(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)); | |
- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this, | |
+ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this, | |
read_packet, NULL, seek_packet); | |
if(!m_aviocontext) | |
--- a/source/blender/imbuf/intern/indexer.c 2018-07-10 02:44:43.422910761 -0600 | |
+++ b/source/blender/imbuf/intern/indexer.c 2018-07-10 02:45:17.399240197 -0600 | |
@@ -537,7 +537,7 @@ | |
av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0); | |
if (rv->of->flags & AVFMT_GLOBALHEADER) { | |
- rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER; | |
+ rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; | |
} | |
if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) { | |
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2018-07-10 02:38:15.715217517 -0600 | |
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2018-07-10 02:49:42.321598256 -0600 | |
@@ -163,7 +163,7 @@ | |
try | |
{ | |
if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER) | |
- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; | |
+ m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; | |
AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id); | |
if(!codec) | |
@@ -185,11 +185,11 @@ | |
if(avcodec_open2(m_codecCtx, codec, NULL)) | |
AUD_THROW(AUD_ERROR_FFMPEG, codec_error); | |
- m_output_buffer.resize(FF_MIN_BUFFER_SIZE); | |
+ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE); | |
int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs)); | |
if(m_codecCtx->frame_size <= 1) { | |
- m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; | |
+ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; | |
m_input_buffer.resize(m_input_size * samplesize); | |
} | |
else | |
--- a/source/blender/blenkernel/intern/writeffmpeg.c 2018-07-10 02:40:52.308691946 -0600 | |
+++ b/source/blender/blenkernel/intern/writeffmpeg.c 2018-07-10 03:05:08.114868203 -0600 | |
@@ -605,8 +605,6 @@ | |
c->rc_buffer_aggressivity = 1.0; | |
#endif | |
- c->me_method = ME_EPZS; | |
- | |
codec = avcodec_find_encoder(c->codec_id); | |
if (!codec) | |
return NULL; | |
@@ -668,14 +666,14 @@ | |
) | |
{ | |
PRINT("Using global header\n"); | |
- c->flags |= CODEC_FLAG_GLOBAL_HEADER; | |
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; | |
} | |
/* Determine whether we are encoding interlaced material or not */ | |
if (rd->mode & R_FIELDS) { | |
PRINT("Encoding interlaced video\n"); | |
- c->flags |= CODEC_FLAG_INTERLACED_DCT; | |
- c->flags |= CODEC_FLAG_INTERLACED_ME; | |
+ c->flags |= AV_CODEC_FLAG_INTERLACED_DCT; | |
+ c->flags |= AV_CODEC_FLAG_INTERLACED_ME; | |
} | |
/* xasp & yasp got float lately... */ | |
@@ -764,7 +762,7 @@ | |
} | |
if (of->oformat->flags & AVFMT_GLOBALHEADER) { | |
- c->flags |= CODEC_FLAG_GLOBAL_HEADER; | |
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; | |
} | |
set_ffmpeg_properties(rd, c, "audio", &opts); | |
@@ -783,14 +781,14 @@ | |
st->codec->time_base.den = st->codec->sample_rate; | |
#ifndef FFMPEG_HAVE_ENCODE_AUDIO2 | |
- context->audio_outbuf_size = FF_MIN_BUFFER_SIZE; | |
+ context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE; | |
#endif | |
if (c->frame_size == 0) | |
// used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD)) | |
// not sure if that is needed anymore, so let's try out if there are any | |
// complaints regarding some ffmpeg versions users might have | |
- context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels; | |
+ context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels; | |
else { | |
context->audio_input_samples = c->frame_size; | |
#ifndef FFMPEG_HAVE_ENCODE_AUDIO2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment