[FFmpeg-cvslog] avcodec/h264_picture: Fix build without error resilience

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 20 21:31:40 2014 +0200| [be656c362d43bc4aa99366dab2d7414fe008f3d6] | committer: Michael Niedermayer

avcodec/h264_picture: Fix build without error resilience

Found-by: Dale Curtis <dalecurtis at chromium.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be656c362d43bc4aa99366dab2d7414fe008f3d6
---

 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 61ff862..e482875 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)
 {