diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-04-01 20:24:46 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-04-09 08:23:22 -0400 |
| commit | f82163cf1c0515a59e6aed9748a17604f892c310 (patch) | |
| tree | b10e02e29c362b642963e19db10773be71db5bff /libavcodec | |
| parent | 17ca374c7d09b9f0c102709f2437a3a76de7bad0 (diff) | |
| download | ffmpeg-f82163cf1c0515a59e6aed9748a17604f892c310.tar.gz | |
Use consistent condition for whether to run slice-threading execute function.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 06aa8aba58..3e9f74a696 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2301,7 +2301,7 @@ static int decode_chunks(AVCodecContext *avctx, break; case PICTURE_START_CODE: - if (avctx->thread_count > 1 && s->slice_count) { + if (HAVE_THREADS && (avctx->active_thread_type&FF_THREAD_SLICE) && s->slice_count) { int i; avctx->execute(avctx, slice_decode_thread, |