Mercurial > libavcodec.hg
changeset 11431:da870c6f71ce libavcodec
Check for reference frames so RV 3/4 won't segfault trying to copy data from
nonexisting reference.
| author | kostya |
|---|---|
| date | Tue, 09 Mar 2010 07:14:34 +0000 |
| parents | b1b2215cb7c7 |
| children | 1a7d902e33ac |
| files | rv34.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/rv34.c Tue Mar 09 06:52:33 2010 +0000 +++ b/rv34.c Tue Mar 09 07:14:34 2010 +0000 @@ -1452,8 +1452,12 @@ av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n"); 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) 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 */ if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size; if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE)