[FFmpeg-cvslog] Use consistent condition for whether to run slice-threading execute function .
Reimar Döffinger
git at videolan.org
Sun Apr 10 03:45:28 CEST 2011
ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Fri Apr 1 20:24:46 2011 -0400| [f82163cf1c0515a59e6aed9748a17604f892c310] | committer: Ronald S. Bultje
Use consistent condition for whether to run slice-threading execute function.
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f82163cf1c0515a59e6aed9748a17604f892c310
---
libavcodec/mpeg12.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 06aa8ab..3e9f74a 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,
More information about the ffmpeg-cvslog
mailing list