Module: libav Branch: release/9 Commit: b6f5a1ca588c2d632184f6f8151b4f6100309db4
Author: Anton Khirnov <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Thu Feb 14 11:43:20 2013 +0100 h264: on reference overflow, reset the reference count to 0, not 1. Since decode_slice_header() returns before the reference lists are constructed, there are zero valid references. CC:[email protected] (cherry picked from commit 668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8) Conflicts: libavcodec/h264.c --- libavcodec/h264.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 848d6a2..6f49dd2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3046,7 +3046,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (h->ref_count[0] > max_refs || h->ref_count[1] > max_refs) { av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); - h->ref_count[0] = h->ref_count[1] = 1; + h->ref_count[0] = h->ref_count[1] = 0; return AVERROR_INVALIDDATA; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
