Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'

[ffmpeg] / libavcodec / error_resilience.c

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index b2e1465b968f7cb1d1bf4c910e61244686119095..2790599744ea23e088c300d0bddcb2e8cb4d6088 100644 (file)
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -592,8 +592,6 @@ skip_mean_and_median:
                              ref[pred_count]    = prev_ref;
                     pred_count++;
 
-skip_last_mv:
-
                     for (j = 0; j < pred_count; j++) {
                         int *linesize = s->cur_pic.f->linesize;
                         int score = 0;
@@ -1136,7 +1134,7 @@ void ff_er_frame_end(ERContext *s)
                 s->mv[0][0][1] = s->cur_pic.motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][1];
             }
 
-            s->decode_mb(s->opaque, 0 /* FIXME h264 partitioned slices need this set */,
+            s->decode_mb(s->opaque, 0 /* FIXME H.264 partitioned slices need this set */,
                          mv_dir, mv_type, &s->mv, mb_x, mb_y, 0, 0);
         }
     }