diff options
| author | Steven Walters <kemuri9@gmail.com> | 2011-10-09 21:38:35 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-10-16 21:45:16 +0200 |
| commit | 27237d524e56210992b18486924894bb4f3fdbb8 (patch) | |
| tree | 02477ac46ef62e3a9293a25b365698ed628e4038 /libavcodec/vp3.c | |
| parent | b44522981ce1f5da1d4ec62950b0933fc18ac223 (diff) | |
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/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 462a482f42..9262c27f05 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1316,7 +1316,7 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y) int h, cy; int offset[4]; - if (HAVE_PTHREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) { + if (HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) { int y_flipped = s->flipped_image ? s->avctx->height-y : y; // At the end of the frame, report INT_MAX instead of the height of the frame. @@ -1400,7 +1400,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) int fragment_width = s->fragment_width[!!plane]; int fragment_height = s->fragment_height[!!plane]; int fragment_start = s->fragment_start[plane]; - int do_await = !plane && HAVE_PTHREADS && (s->avctx->active_thread_type&FF_THREAD_FRAME); + int do_await = !plane && HAVE_THREADS && (s->avctx->active_thread_type&FF_THREAD_FRAME); if (!s->flipped_image) stride = -stride; if (CONFIG_GRAY && plane && (s->avctx->flags & CODEC_FLAG_GRAY)) @@ -1965,7 +1965,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, *data_size=sizeof(AVFrame); *(AVFrame*)data= s->current_frame; - if (!HAVE_PTHREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) + if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) update_frames(avctx); return buf_size; @@ -1973,7 +1973,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, error: ff_thread_report_progress(&s->current_frame, INT_MAX, 0); - if (!HAVE_PTHREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) + if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) avctx->release_buffer(avctx, &s->current_frame); return -1; |