diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-01-18 10:53:41 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-01-21 13:26:44 +0100 |
| commit | 2473a45c85dce6872617b33fce396dbbd6347e8e (patch) | |
| tree | 771d986fe1409d274578362fae12b3e7fed8c23a /libavcodec | |
| parent | afb8b207d6c82bc063ab984b2875074457db2e4f (diff) | |
| download | ffmpeg-2473a45c85dce6872617b33fce396dbbd6347e8e.tar.gz | |
threads: change the default for threads back to 1
Using threaded decoding by default breaks backward compatibility if
AVHWAccel is used or if an appliction sets threadunsafe callbacks.
Avconv and avplay still use -threads auto if not specified.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 0d41da52ac..2689d32a92 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -372,7 +372,7 @@ static const AVOption options[]={ {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"}, #endif {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"}, +{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"}, {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, |