summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-29 04:26:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-29 04:26:36 +0200
commit097a909ea126b165809b43227e74d99c14f783cc (patch)
tree6403f53819927c83cac3770247bdcc1a16be2bca /libavcodec/utils.c
parent028b6d2b5cf6a6dc593921c4ceab60a747eccf71 (diff)
frame_thread_encoder: pass private options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 150d90703a..b93be5f8fe 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -874,7 +874,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
av_log(avctx, AV_LOG_WARNING, "Warning: not compiled with thread support, using thread emulation\n");
entangled_thread_counter--; //we will instanciate a few encoders thus kick the counter to prevent false detection of a problem
- ret = ff_frame_thread_encoder_init(avctx);
+ ret = ff_frame_thread_encoder_init(avctx, options ? *options : NULL);
entangled_thread_counter++;
if (ret < 0)
goto free_and_end;