mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
|
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
|
||
|
|
index f311e04d8e0..4f474d0c267 100644
|
||
|
|
--- a/intern/ffmpeg/ffmpeg_compat.h
|
||
|
|
+++ b/intern/ffmpeg/ffmpeg_compat.h
|
||
|
|
@@ -36,6 +36,10 @@
|
||
|
|
# define FFMPEG_INLINE static inline
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100)
|
||
|
|
+# define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#if (LIBAVFORMAT_VERSION_MAJOR < 58) || \
|
||
|
|
((LIBAVFORMAT_VERSION_MAJOR == 58) && (LIBAVFORMAT_VERSION_MINOR < 76))
|
||
|
|
# define FFMPEG_USE_DURATION_WORKAROUND 1
|
||
|
|
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
|
||
|
|
index 1d4cbc48833..c812c2e8f26 100644
|
||
|
|
--- a/source/blender/blenkernel/intern/writeffmpeg.c
|
||
|
|
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
|
||
|
|
@@ -855,7 +855,7 @@ static AVStream *alloc_video_stream(FFMpegContext *context,
|
||
|
|
255);
|
||
|
|
st->avg_frame_rate = av_inv_q(c->time_base);
|
||
|
|
|
||
|
|
- if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
|
||
|
|
+ if (codec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
|
||
|
|
c->thread_count = 0;
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
|
||
|
|
index 94c0555dcf0..52314c2ca21 100644
|
||
|
|
--- a/source/blender/imbuf/intern/anim_movie.c
|
||
|
|
+++ b/source/blender/imbuf/intern/anim_movie.c
|
||
|
|
@@ -554,7 +554,7 @@ static int startffmpeg(struct anim *anim)
|
||
|
|
avcodec_parameters_to_context(pCodecCtx, video_stream->codecpar);
|
||
|
|
pCodecCtx->workaround_bugs = FF_BUG_AUTODETECT;
|
||
|
|
|
||
|
|
- if (pCodec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
|
||
|
|
+ if (pCodec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
|
||
|
|
pCodecCtx->thread_count = 0;
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
|
||
|
|
index 63836690ee4..fb0dd4f3e3e 100644
|
||
|
|
--- a/source/blender/imbuf/intern/indexer.c
|
||
|
|
+++ b/source/blender/imbuf/intern/indexer.c
|
||
|
|
@@ -559,7 +559,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg(
|
||
|
|
av_dict_set(&codec_opts, "preset", "veryfast", 0);
|
||
|
|
av_dict_set(&codec_opts, "tune", "fastdecode", 0);
|
||
|
|
|
||
|
|
- if (rv->codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
|
||
|
|
+ if (rv->codec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
|
||
|
|
rv->c->thread_count = 0;
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
@@ -872,7 +872,7 @@ static IndexBuildContext *index_ffmpeg_create_context(struct anim *anim,
|
||
|
|
avcodec_parameters_to_context(context->iCodecCtx, context->iStream->codecpar);
|
||
|
|
context->iCodecCtx->workaround_bugs = FF_BUG_AUTODETECT;
|
||
|
|
|
||
|
|
- if (context->iCodec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
|
||
|
|
+ if (context->iCodec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
|
||
|
|
context->iCodecCtx->thread_count = 0;
|
||
|
|
}
|
||
|
|
else {
|