Commit 7a342f97 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dxa: Make sure the reference frame exists

See: 12eb2fd5Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bd710710 5ef7c84a
......@@ -262,6 +262,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
case 3:
case 4:
case 5:
if (!tmpptr) {
av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
return AVERROR_INVALIDDATA;
}
frame->key_frame = !(compr & 1);
frame->pict_type = (compr & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
for(j = 0; j < avctx->height; j++){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment