[FFmpeg-devel] [PATCH 6/6] error_concealment: also wait for data for h264

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/error_resilience.c |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 472ce06..071d58f 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -570,12 +570,8 @@ skip_mean_and_median:
                     pred_count++;
 
                     if (!fixed[mb_xy] && 0) {
-                        if (s->avctx->codec_id == AV_CODEC_ID_H264) {
-                            // FIXME
-                        } else {
-                            ff_thread_await_progress(&s->last_pic->f,
-                                                     mb_y, 0);
-                        }
+                        ff_thread_await_progress(&s->last_pic->f,
+                                                    mb_y, 0);
                         if (!s->last_pic->f.motion_val[0] ||
                             !s->last_pic->f.ref_index[0])
                             goto skip_last_mv;
@@ -729,11 +725,8 @@ static int is_intra_more_likely(ERContext *s)
                 uint8_t *last_mb_ptr = s->last_pic->f.data[0] +
                                        mb_x * 16 + mb_y * 16 * linesize[0];
 
-                if (s->avctx->codec_id == AV_CODEC_ID_H264) {
-                    // FIXME
-                } else {
-                    ff_thread_await_progress(&s->last_pic->f, mb_y, 0);
-                }
+                ff_thread_await_progress(&s->last_pic->f, mb_y, 0);
+
                 is_intra_likely += s->dsp->sad[0](NULL, last_mb_ptr, mb_ptr,
                                                  linesize[0], 16);
                 // FIXME need await_progress() here
-- 
1.7.9.5