From 838e36635ab5be523037bd6064573299f3936a37 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 13 Sep 2011 14:40:13 +0200 Subject: [PATCH] avcodec: move "thread emulation" warning to common code Signed-off-by: Michael Niedermayer --- ffplay.c | 3 --- libavcodec/utils.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index 8123f4375f..9d21714815 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2890,9 +2890,6 @@ static int opt_duration(const char *opt, const char *arg) static int opt_thread_count(const char *opt, const char *arg) { thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); -#if !HAVE_THREADS - fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n"); -#endif return 0; } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ee1bfcc4ef..da12dda3fc 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -576,6 +576,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD } avctx->frame_number = 0; + if (!HAVE_THREADS) + av_log(avctx, AV_LOG_WARNING, "Warning: not compiled with thread support, using thread emulation\n"); + if (HAVE_THREADS && !avctx->thread_opaque) { ret = ff_thread_init(avctx); if (ret < 0) { -- 2.11.0