From be656c362d43bc4aa99366dab2d7414fe008f3d6 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 20 May 2014 21:31:40 +0200
Subject: [PATCH] avcodec/h264_picture: Fix build without error resilience

Found-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/h264_picture.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index 61ff862a7a..e4828758cc 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -130,9 +130,9 @@ fail:
     return ret;
 }
 
-#if CONFIG_ERROR_RESILIENCE
 void ff_h264_set_erpic(ERPicture *dst, H264Picture *src)
 {
+#if CONFIG_ERROR_RESILIENCE
     int i;
 
     memset(dst, 0, sizeof(*dst));
@@ -150,8 +150,8 @@ void ff_h264_set_erpic(ERPicture *dst, H264Picture *src)
 
     dst->mb_type = src->mb_type;
     dst->field_picture = src->field_picture;
-}
 #endif /* CONFIG_ERROR_RESILIENCE */
+}
 
 int ff_h264_field_end(H264Context *h, int in_setup)
 {