[FFmpeg-cvslog] lavfi/movie: Use filter thread count for decoding threads.
Carl Eugen Hoyos
git at videolan.org
Tue Oct 1 22:55:40 EEST 2019
ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Sun Aug 25 18:42:02 2019 +0200| [7ffa458d600eccbd2582d755af75c03bdaa9e51f] | committer: Carl Eugen Hoyos
lavfi/movie: Use filter thread count for decoding threads.
Fixes ticket #7542.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ffa458d600eccbd2582d755af75c03bdaa9e51f
---
libavfilter/src_movie.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index bcabfcc4c2..79423a894d 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -153,14 +153,14 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec)
return found;
}
-static int open_stream(void *log, MovieStream *st)
+static int open_stream(AVFilterContext *ctx, MovieStream *st)
{
AVCodec *codec;
int ret;
codec = avcodec_find_decoder(st->st->codecpar->codec_id);
if (!codec) {
- av_log(log, AV_LOG_ERROR, "Failed to find any codec\n");
+ av_log(ctx, AV_LOG_ERROR, "Failed to find any codec\n");
return AVERROR(EINVAL);
}
@@ -173,9 +173,10 @@ static int open_stream(void *log, MovieStream *st)
return ret;
st->codec_ctx->refcounted_frames = 1;
+ st->codec_ctx->thread_count = ff_filter_get_nb_threads(ctx);
if ((ret = avcodec_open2(st->codec_ctx, codec, NULL)) < 0) {
- av_log(log, AV_LOG_ERROR, "Failed to open codec\n");
+ av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n");
return ret;
}
More information about the ffmpeg-cvslog
mailing list