diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-30 03:03:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-21 20:43:37 +0200 |
| commit | 69f122abd9be9e0b51f81a061f4ae5fbe2bd021e (patch) | |
| tree | b9c27b52b69f253e842a466a30af41a94f69f533 | |
| parent | 8016800a64837332104fba122c2f73f926cb9f2a (diff) | |
| download | ffmpeg-69f122abd9be9e0b51f81a061f4ae5fbe2bd021e.tar.gz | |
avfilter/lavfutils: disable frame threads when decoding a single image
The image decoding code does expect the image to be decoded immedeatly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d2184bf3b65354e44c177e226a6c59c5d6fdbad4)
Conflicts:
libavfilter/lavfutils.c
| -rw-r--r-- | libavfilter/lavfutils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index 80310d2fea..095f84baad 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -32,6 +32,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4], AVFrame *frame; int frame_decoded, ret = 0; AVPacket pkt; + AVDictionary *opt=NULL; av_init_packet(&pkt); @@ -57,7 +58,8 @@ int ff_load_image(uint8_t *data[4], int linesize[4], goto end; } - if ((ret = avcodec_open2(codec_ctx, codec, NULL)) < 0) { + av_dict_set(&opt, "thread_type", "slice", 0); + if ((ret = avcodec_open2(codec_ctx, codec, &opt)) < 0) { av_log(log_ctx, AV_LOG_ERROR, "Failed to open codec\n"); goto end; } @@ -97,6 +99,7 @@ end: avcodec_close(codec_ctx); avformat_close_input(&format_ctx); av_freep(&frame); + av_dict_free(&opt); if (ret < 0) av_log(log_ctx, AV_LOG_ERROR, "Error loading image file '%s'\n", filename); |