diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:51:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:51:33 +0100 |
| commit | ace0cfea60a32c2d2c89ce31fed8466625b09ac6 (patch) | |
| tree | 442bd781b252ab542a7ebbc8b6a0435ae8cab05d /libavcodec/h263dec.c | |
| parent | 12f203a0987935b79870a9502b7e148fa064897c (diff) | |
| parent | 05fa79b8448059913dea321fdf92764b64deeecc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: fix use with frame based multithreading
Conflicts:
libavcodec/h263dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index adcbcd8a89..405d3c68fd 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -655,7 +655,8 @@ retry: if ((ret = ff_MPV_frame_start(s, avctx)) < 0) return ret; - if (!s->divx_packed) ff_thread_finish_setup(avctx); + if (!s->divx_packed && !avctx->hwaccel) + ff_thread_finish_setup(avctx); if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) { ff_vdpau_mpeg4_decode_picture(s, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); @@ -744,6 +745,9 @@ intrax8_decoded: ff_MPV_frame_end(s); + if (!s->divx_packed && avctx->hwaccel) + ff_thread_finish_setup(avctx); + av_assert1(s->current_picture.f.pict_type == s->current_picture_ptr->f.pict_type); av_assert1(s->current_picture.f.pict_type == s->pict_type); if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { |