[FFmpeg-devel] [PATCH 4/4] Fix missing guards when error resilience is disabled.

Dale Curtis dalecurtis at chromium.org
Tue May 20 21:03:59 CEST 2014


---
 libavcodec/h264_slice.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 49af2c1..a950043 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1936,8 +1936,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
                              (h->ref_list[j][i].reference & 3);
     }
 
+#if CONFIG_ERROR_RESILIENCE
     if (h->ref_count[0]) ff_h264_set_erpic(&h->er.last_pic, &h->ref_list[0][0]);
     if (h->ref_count[1]) ff_h264_set_erpic(&h->er.next_pic, &h->ref_list[1][0]);
+#endif
 
     h->er.ref_count = h->ref_count[0];
     h0->au_pps_id = pps_id;
-- 
1.9.1.423.g4596e3a



More information about the ffmpeg-devel mailing list