diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 11:53:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 11:53:19 +0100 |
| commit | 2d2e6db7cfe5d50fb428a03f7c6450e7248d0a36 (patch) | |
| tree | 56bf6e124c332247552732968a9c4606e13dbdd7 | |
| parent | ec203cd69b57e298e6735e041fb5a2a0c880b44c (diff) | |
| parent | 668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8 (diff) | |
| download | ffmpeg-2d2e6db7cfe5d50fb428a03f7c6450e7248d0a36.tar.gz | |
Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
* commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8':
h264: on reference overflow, reset the reference count to 0, not 1.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 56f3c47e87..be144f5250 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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]){ 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; } |