diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 18:08:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-22 12:27:24 +0200 |
| commit | dcf23f12979e355af06a2a7655019bf7c5370c5f (patch) | |
| tree | d91be0ace1aae1f367822c848f2d0b2724494f02 | |
| parent | 44d447f31cf97388b644e221cc60aa89083b7918 (diff) | |
| download | ffmpeg-dcf23f12979e355af06a2a7655019bf7c5370c5f.tar.gz | |
avcodec/h264_refs: Do not set reference to things which dont exist
Fixes deadlock
Fixes Ticket4428
Fixes Ticket4429
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 429de043202286a2b5bcc082cc02de860b734db2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index e6228c2025..bb99b03247 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -681,7 +681,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) */ if (h->short_ref_count && h->short_ref[0] == h->cur_pic_ptr) { /* Just mark the second field valid */ - h->cur_pic_ptr->reference = PICT_FRAME; + h->cur_pic_ptr->reference |= h->picture_structure; } else if (h->cur_pic_ptr->long_ref) { av_log(h->avctx, AV_LOG_ERROR, "illegal short term reference " "assignment for second field " |