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/mpeg12.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/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 0575a976f0..d7e266b322 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1634,7 +1634,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) *s->current_picture_ptr->f.pan_scan = s1->pan_scan; - if (HAVE_PTHREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) + if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) ff_thread_finish_setup(avctx); } else { // second field int i; |