Commit 2d2e6db7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '668e16a0'

* commit '668e16a0':
  h264: on reference overflow, reset the reference count to 0, not 1.

Conflicts:
	libavcodec/h264.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ec203cd6 668e16a0
...@@ -3525,7 +3525,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) ...@@ -3525,7 +3525,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
if (h->ref_count[0]-1 > max[0] || h->ref_count[1]-1 > max[1]){ if (h->ref_count[0]-1 > max[0] || h->ref_count[1]-1 > max[1]){
av_log(h->avctx, AV_LOG_ERROR, "reference overflow %u > %u or %u > %u\n", h->ref_count[0]-1, max[0], h->ref_count[1]-1, max[1]); av_log(h->avctx, AV_LOG_ERROR, "reference overflow %u > %u or %u > %u\n", h->ref_count[0]-1, max[0], h->ref_count[1]-1, max[1]);
h->ref_count[0] = h->ref_count[1] = 1; h->ref_count[0] = h->ref_count[1] = 0;
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment