diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2011-12-25 11:45:05 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-12-31 17:40:12 +0100 |
| commit | e4e30256f87f177decf59b59e923d05ef64147df (patch) | |
| tree | 2de636013d8948f622a34de63d296ff642b88714 /libavcodec | |
| parent | c11b92b304334b1241ee79406dca6a03131fc921 (diff) | |
| download | ffmpeg-e4e30256f87f177decf59b59e923d05ef64147df.tar.gz | |
threads: default to automatic thread count detection
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/options.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 4ac9313f27..4ac92fd29e 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -370,7 +370,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 = 1 }, 0, INT_MAX, V|E|D, "threads"}, +{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 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}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 9b4f6d71b8..e6226cb224 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -22,7 +22,7 @@ #define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MINOR 32 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |