diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 03:40:20 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-09-01 10:01:22 +0200 |
| commit | 95d0baa95217097a7840729003d528f198a980f5 (patch) | |
| tree | 1e25b3e2e1932f26e8ee35a54bf1f0dd15f46b48 /libavcodec | |
| parent | 32cff0d3f096293189916ea438918bcca0445d50 (diff) | |
| download | ffmpeg-95d0baa95217097a7840729003d528f198a980f5.tar.gz | |
avcodec/h264: set er.ref_count earlier
Fixes Ticket2910
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 93cf7b01950b9d8e1646227752b522d0275d32df)
Diffstat (limited to 'libavcodec')
| -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 3a83b4b031..acc42eeb95 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3775,6 +3775,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (h->ref_count[0]) h->er.last_pic = &h->ref_list[0][0]; if (h->ref_count[1]) h->er.next_pic = &h->ref_list[1][0]; + h->er.ref_count = h->ref_count[0]; if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG, @@ -4166,7 +4167,6 @@ static void er_add_slice(H264Context *h, int startx, int starty, if (CONFIG_ERROR_RESILIENCE) { ERContext *er = &h->er; - er->ref_count = h->ref_count[0]; ff_er_add_slice(er, startx, starty, endx, endy, status); } } |