Message ID | AS1PR01MB95647D62E11654C771A62E168F199@AS1PR01MB9564.eurprd01.prod.exchangelabs.com |
---|---|
State | Accepted |
Commit | 1970ee10459942235f6639f013e755da69cc2048 |
Headers | show |
Series | [FFmpeg-devel,1/3] avcodec/h264_slice: Fix decoding undamaged input with slices | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_aarch64_jetson | success | Make finished |
andriy/make_fate_aarch64_jetson | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index bb770ff674..2187586618 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -81,7 +81,6 @@ typedef struct ERContext { uint16_t pb_time; int quarter_sample; int partitioned_frame; - int ref_count; void (*decode_mb)(void *opaque, int ref, int mv_dir, int mv_type, int (*mv)[2][4][2], diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index f438376431..9faa35e36d 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -776,8 +776,6 @@ end: if (sl->ref_count[1]) ff_h264_set_erpic(&h->er.next_pic, sl->ref_list[1][0].parent); - h->er.ref_count = sl->ref_count[0]; - ff_er_frame_end(&h->er); if (use_last_pic) memset(&sl->ref_list[0][0], 0, sizeof(sl->ref_list[0][0]));
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/error_resilience.h | 1 - libavcodec/h264dec.c | 2 -- 2 files changed, 3 deletions(-)