Browse Source

error_concealment: Check that the reference is not NULL

In normal picture decoding this does not need to be checked but as
error concealment is run in the case of errors the availability of
references is less certain. This may be fixed differently at some
point so that all references are always filled in before the EC
code, in which case this should then be changed to an assert()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Michael Niedermayer 14 years ago
parent
commit
903ccf71b7
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/error_resilience.c

+ 4
- 0
libavcodec/error_resilience.c View File

@@ -60,6 +60,10 @@ static void decode_mb(MpegEncContext *s, int ref)
* practice then correct remapping should be added. */
if (ref >= h->ref_count[0])
ref = 0;
if (!h->ref_list[0][ref].f.data[0]) {
av_log(s->avctx, AV_LOG_DEBUG, "Reference not available for error concealing\n");
ref = 0;
}
fill_rectangle(&s->current_picture.f.ref_index[0][4 * h->mb_xy],
2, 2, 2, ref, 1);
fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1);


Loading…
Cancel
Save