summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorSteven Walters <kemuri9@gmail.com>2011-10-09 21:38:35 +0200
committerJanne Grunau <janne-libav@jannau.net>2011-10-16 21:45:16 +0200
commit27237d524e56210992b18486924894bb4f3fdbb8 (patch)
tree02477ac46ef62e3a9293a25b365698ed628e4038 /libavcodec/h264.c
parentb44522981ce1f5da1d4ec62950b0933fc18ac223 (diff)
downloadffmpeg-streaming-27237d524e56210992b18486924894bb4f3fdbb8.zip
ffmpeg-streaming-27237d524e56210992b18486924894bb4f3fdbb8.tar.gz
w32threads: support for frame multithreading
Replace our incomplete w32threads implementation with x264's pthreads w32threads wrapper. Relicensed to LGPL with kind permission by Pegasys Inc. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b1204c0..1faaaa6 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -688,7 +688,7 @@ static av_always_inline void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t
assert(IS_INTER(mb_type));
- if(HAVE_PTHREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
+ if(HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
await_references(h);
prefetch_motion(h, 0, pixel_shift, chroma444);
OpenPOWER on IntegriCloud