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/mpegvideo.c | |
| parent | f524b1184e94cf1ffff15f4f393172a73bb4b7f6 (diff) | |
| parent | 27237d524e56210992b18486924894bb4f3fdbb8 (diff) | |
| download | ffmpeg-266172aaf968bb71713490cdc64ae4929ad08b8b.tar.gz | |
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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 041c0c04c3..7ed663fb82 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2135,7 +2135,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], /* decoding or more than one mb_type (MC was already done otherwise) */ if(!s->encoding){ - if(HAVE_PTHREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) { + if(HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) { if (s->mv_dir & MV_DIR_FORWARD) { ff_thread_await_progress((AVFrame*)s->last_picture_ptr, MPV_lowest_referenced_row(s, 0), 0); } |