Skip to content
Snippets Groups Projects
Commit 95bd18ee authored by Kostya Shishkov's avatar Kostya Shishkov
Browse files

Check for reference frames so RV 3/4 won't segfault trying to copy data from

nonexisting reference.

Originally committed as revision 22378 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d63a7187
No related branches found
No related tags found
No related merge requests found
...@@ -1452,8 +1452,12 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, ...@@ -1452,8 +1452,12 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n"); av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n");
return -1; return -1;
} }
if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_P_TYPE)
return -1;
if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE) if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE)
return -1; return -1;
if((!s->next_picture_ptr || !s->next_picture_ptr->data[0]) && si.type == FF_B_TYPE)
return -1;
/* skip b frames if we are in a hurry */ /* skip b frames if we are in a hurry */
if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size; if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size;
if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE) if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment