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

mpegvideo: dont allow last == current

Browse Source 
this fixes deadlocks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-11 20:19:34 +01:00
parent 9dd0b7ad82
commit 9e73f6d1f9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo.c
View File

@ -1434,6 +1434,8 @@ static inline int pic_is_unused(MpegEncContext *s, Picture *pic)
&& pic->f.qscale_table //check if the frame has anything allocated
&& pic->period_since_free < s->avctx->thread_count)
return 0;
if (pic == s->last_picture_ptr)
return 0;
if (pic->f.data[0] == NULL)
return 1;
if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF))
@ -1447,7 +1449,7 @@ static int find_unused_picture(MpegEncContext *s, int shared)
if (shared) {
for (i = 0; i < MAX_PICTURE_COUNT; i++) {
if (s->picture[i].f.data[0] == NULL)
if (s->picture[i].f.data[0] == NULL && &s->picture[i] != s->last_picture_ptr)
return i;
}
} else {