diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-17 02:29:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-17 02:29:40 +0200 |
| commit | 266172aaf968bb71713490cdc64ae4929ad08b8b (patch) | |
| tree | 0f67e7bc87198468c684554bd392abc026f3d79e /libavcodec/h264_direct.c | |
| parent | f524b1184e94cf1ffff15f4f393172a73bb4b7f6 (diff) | |
| parent | 27237d524e56210992b18486924894bb4f3fdbb8 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
w32threads: support for frame multithreading
avcodec: remove stray @deprecated comment
Conflicts:
libavcodec/utils.c
libavcodec/w32thread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index abc0700945..453199d540 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -148,7 +148,7 @@ static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y int ref_field_picture = ref->field_picture; int ref_height = 16*h->s.mb_height >> ref_field_picture; - if(!HAVE_PTHREADS || !(h->s.avctx->active_thread_type&FF_THREAD_FRAME)) + if(!HAVE_THREADS || !(h->s.avctx->active_thread_type&FF_THREAD_FRAME)) return; //FIXME it can be safe to access mb stuff |