diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-01-01 20:24:24 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-01-02 19:20:23 +0100 |
| commit | 881a5e047dc78ec9ab771817497dffec503d77ee (patch) | |
| tree | 0857c45d86537a7efe7c54dcbbe6b2d956b32861 /libavcodec/options.c | |
| parent | 264808219d8be93aeda0b6ade8c64898b673f6bc (diff) | |
| download | ffmpeg-881a5e047dc78ec9ab771817497dffec503d77ee.tar.gz | |
mpegenc: use avctx->slices as number of slices
Adds a new member to MpegEncContext to hold the number of used slice
contexts. Fixes segfaults with '-threads 17 -thread_type slice' and
fate-vsynth{1,2}-mpeg{2,4}thread{,_ilace} with --disable-pthreads.
Diffstat (limited to 'libavcodec/options.c')
| -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 4ac92fd29e..a99aed7ad1 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -506,7 +506,7 @@ static const AVOption options[]={ {"cholesky", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = AV_LPC_TYPE_CHOLESKY }, INT_MIN, INT_MAX, A|E, "lpc_type"}, {"lpc_passes", "deprecated, use flac-specific options", OFFSET(lpc_passes), AV_OPT_TYPE_INT, {.dbl = -1 }, INT_MIN, INT_MAX, A|E}, #endif -{"slices", "number of slices, used in parallelized decoding", OFFSET(slices), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E}, +{"slices", "number of slices, used in parallelized encoding", OFFSET(slices), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E}, {"thread_type", "select multithreading type", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, {.dbl = FF_THREAD_SLICE|FF_THREAD_FRAME }, 0, INT_MAX, V|E|D, "thread_type"}, {"slice", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_THREAD_SLICE }, INT_MIN, INT_MAX, V|E|D, "thread_type"}, {"frame", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_THREAD_FRAME }, INT_MIN, INT_MAX, V|E|D, "thread_type"}, |