generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: disallow single unpaired fields as references of frames

Browse Source 
Fixes deadlock
This commit is contained in:
Michael Niedermayer 2013-03-12 02:08:06 +01:00
parent c69acbf881
commit 01a0283c92
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264_refs.c
View File

@ -293,12 +293,14 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
} }
for(list=0; list<h->list_count; list++){ for(list=0; list<h->list_count; list++){
for(index= 0; index < h->ref_count[list]; index++){ for(index= 0; index < h->ref_count[list]; index++){
if (!h->ref_list[list][index].f.data[0]) { if ( !h->ref_list[list][index].f.data[0]
|| (!FIELD_PICTURE && (h->ref_list[list][index].reference&3) != 3)) {
int i; int i;
av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture, default is %d\n", h->default_ref_list[list][0].poc); av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture, default is %d\n", h->default_ref_list[list][0].poc);
for (i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++) for (i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++)
h->last_pocs[i] = INT_MIN; h->last_pocs[i] = INT_MIN;
if (h->default_ref_list[list][0].f.data[0]) if (h->default_ref_list[list][0].f.data[0]
&& !(!FIELD_PICTURE && (h->default_ref_list[list][index].reference&3) != 3))
COPY_PICTURE(&h->ref_list[list][index], &h->default_ref_list[list][0]); COPY_PICTURE(&h->ref_list[list][index], &h->default_ref_list[list][0]);
else else
return -1; return -1;