mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-24 03:35:38 +03:00
49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
https://github.com/FFmpeg/FFmpeg/commit/7d09579190def3ef7562399489e628f3b65714ce
|
|
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
|
|
index 1d4cbc4..c812c2e 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 94c0555..52314c2 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 6383669..fb0dd4f 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 {
|