ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/lavfutils: disable frame threads when decoding a single image

Browse Source 
The image decoding code does expect the image to be decoded immedeatly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d2184bf3b6)

Conflicts:

	libavfilter/lavfutils.c
This commit is contained in:
Michael Niedermayer 2015-04-30 03:03:31 +02:00
parent 8016800a64
commit 69f122abd9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/lavfutils.c
View File

@ -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);