diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 03:40:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 04:02:03 +0200 |
| commit | 93cf7b01950b9d8e1646227752b522d0275d32df (patch) | |
| tree | 67e9d2036c39f805d4a241be7d7019602689d75f /libavcodec/h264.c | |
| parent | 990bbc15b8e749f88e5a088239a05b86dd022fe3 (diff) | |
| download | ffmpeg-93cf7b01950b9d8e1646227752b522d0275d32df.tar.gz | |
avcodec/h264: set er.ref_count earlier
Fixes Ticket2910
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -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 1d069a888e..a9995bd8bc 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3998,6 +3998,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, @@ -4389,7 +4390,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); } } |