diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-03-27 14:38:21 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-03-28 23:08:07 +0200 |
| commit | e9ccdae09b1913fa2427c2a7f87a5ba6ce8c5d60 (patch) | |
| tree | f8e0f51de121e08ed6a7b2fd78218f9029f5ee4b | |
| parent | 46027c7286144294dee565946dccb59f1a8dfeca (diff) | |
| download | ffmpeg-e9ccdae09b1913fa2427c2a7f87a5ba6ce8c5d60.tar.gz | |
Use consistent condition for whether to run slice-threading execute function.
| -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 5db24e87fd..7034a91b51 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2344,7 +2344,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, |