av_assert0(0);
}
- if (i < 0) {
+ if (i < 0 || mismatches_ref(h, ref)) {
av_log(h->avctx, AV_LOG_ERROR,
- "reference picture missing during reorder\n");
+ i < 0 ? "reference picture missing during reorder\n" :
+ "mismatching reference\n"
+ );
memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME
} else {
for (i = index; i + 1 < sl->ref_count[list]; i++) {
for (j = 0; j < MAX_DELAYED_PIC_COUNT; j++)
h->last_pocs[j] = INT_MIN;
break;
- default: assert(0);
+ default: av_assert0(0);
}
}
}
}
+ // Detect unmarked random access points
if ( err >= 0
&& h->long_ref_count==0
&& ( h->short_ref_count<=2
+ || pps_ref_count[0] <= 2 && pps_ref_count[1] <= 1 && h->avctx->has_b_frames
|| pps_ref_count[0] <= 1 + (h->picture_structure != PICT_FRAME) && pps_ref_count[1] <= 1)
&& pps_ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) + (2*!h->has_recovery_point)
&& h->cur_pic_ptr->f->pict_type == AV_PICTURE_TYPE_I){
av_log(logctx, AV_LOG_ERROR,
"illegal long ref in memory management control "
"operation %d\n", opcode);
+ sl->nb_mmco = i;
return -1;
}
mmco[i].long_arg = long_arg;
av_log(logctx, AV_LOG_ERROR,
"illegal memory management control operation %d\n",
opcode);
+ sl->nb_mmco = i;
return -1;
}
if (opcode == MMCO_END)