From ca1e36a8e4cd416142487071dbca734567bdaddf Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 20 Jun 2014 12:48:06 -0400 Subject: h264: fix build when error resilience is disabled --- libavcodec/h264_picture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/h264_picture.c') diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index b35cc52033..1d7461b799 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -171,6 +171,7 @@ int ff_h264_field_end(H264Context *h, int in_setup) "hardware accelerator failed to decode picture\n"); } +#if CONFIG_ERROR_RESILIENCE /* * FIXME: Error handling code does not seem to support interlaced * when slices span multiple rows @@ -183,7 +184,7 @@ int ff_h264_field_end(H264Context *h, int in_setup) * past end by one (callers fault) and resync_mb_y != 0 * causes problems for the first MB line, too. */ - if (CONFIG_ERROR_RESILIENCE && !FIELD_PICTURE(h)) { + if (!FIELD_PICTURE(h)) { h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr); h264_set_erpic(&h->er.last_pic, h->ref_count[0] ? &h->ref_list[0][0] : NULL); @@ -191,6 +192,8 @@ int ff_h264_field_end(H264Context *h, int in_setup) h->ref_count[1] ? &h->ref_list[1][0] : NULL); ff_er_frame_end(&h->er); } +#endif /* CONFIG_ERROR_RESILIENCE */ + emms_c(); h->current_slice = 0; -- cgit v1.2.3