diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-19 19:58:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 14:28:20 +0100 |
| commit | 5167bb2e8eaa75ced83388bacc7b74040871b3bf (patch) | |
| tree | d3e3cbed620519783b1f0a3c36b18e0ebb7bc2a3 /libavcodec/error_resilience.c | |
| parent | 547042a8cd0f425263a4f96603debe8b4fab1b93 (diff) | |
er: Fix slice threading check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index d5fbcbd668..70a800a746 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -827,7 +827,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, s->error_status_table[start_xy] |= VP_START; - if (start_xy > 0 && s->avctx->thread_count <= 1 && + if (start_xy > 0 && !(s->avctx->active_thread_type & FF_THREAD_SLICE) && s->avctx->skip_top * s->mb_width < start_i) { int prev_status = s->error_status_table[s->mb_index2xy[start_i - 1]]; |