diff options
| author | Michael Niedermayer | 2011-09-13 14:40:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2011-09-13 15:05:42 +0200 |
| commit | 838e36635ab5be523037bd6064573299f3936a37 (patch) | |
| tree | 2c5aae2331d3970e978e9c66f07137398384e54e | |
| parent | 391b1e391187c30ae0e3bad9c0e9c40df18785bf (diff) | |
avcodec: move "thread emulation" warning to common code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffplay.c | 3 | ||||
| -rw-r--r-- | libavcodec/utils.c | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -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) { |