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/h264.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/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8a8653eba1..a736070f0f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2070,7 +2070,7 @@ static void decode_postinit(H264Context *h, int setup_finished) h->sync |= 2; } - if (setup_finished) + if (setup_finished && !h->avctx->hwaccel) ff_thread_finish_setup(h->avctx); } |