error_resilience: skip last-MV predictor step if MVs are not available.
authorRonald Bultje <rsbultje@gmail.com>
Mon, 20 Jun 2011 15:07:56 +0000 (15:07 +0000)
committerReinhard Tartler <siretart@tauware.de>
Mon, 20 Jun 2011 20:18:27 +0000 (22:18 +0200)
Fixes crashes when playing broken MPEG2-TS streams.

libavcodec/error_resilience.c

index ad7a7c6..8906b49 100644 (file)
@@ -534,6 +534,9 @@ skip_mean_and_median:
                             ff_thread_await_progress((AVFrame *) s->last_picture_ptr,
                                                      mb_y, 0);
                         }
+                        if (!s->last_picture.motion_val[0] ||
+                            !s->last_picture.ref_index[0])
+                            goto skip_last_mv;
                         prev_x = s->last_picture.motion_val[0][mot_index][0];
                         prev_y = s->last_picture.motion_val[0][mot_index][1];
                         prev_ref = s->last_picture.ref_index[0][4*mb_xy];
@@ -548,6 +551,7 @@ skip_mean_and_median:
                     mv_predictor[pred_count][1]= prev_y;
                     ref         [pred_count]   = prev_ref;
                     pred_count++;
+                skip_last_mv:
 
                     s->mv_dir = MV_DIR_FORWARD;
                     s->mb_intra=0;