aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-19 06:18:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-19 06:18:58 +0100
commit96d1b7ffcab46dc40bd41afd7833a3380c53709c (patch)
tree139bb936ab3d4f8351384eeff7a0c02cadf91f39 /libavcodec
parent5c42078b9901f95026d2ed4dae0df0d8abd90d03 (diff)
downloadffmpeg-96d1b7ffcab46dc40bd41afd7833a3380c53709c.tar.gz
h264: unmark frames at the end
Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f43e99efc5..d2941ca695 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4327,6 +4327,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
h->delayed_pic[i] = h->delayed_pic[i + 1];
if (out) {
+ out->f.reference &= ~DELAYED_PIC_REF;
*got_frame = 1;
*pict = out->f;
}