summaryrefslogtreecommitdiff
path: root/libavcodec/h264_picture.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-20 21:31:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-20 21:31:40 +0200
commitbe656c362d43bc4aa99366dab2d7414fe008f3d6 (patch)
tree619096088264b9c6d7474915f00ab132abe22404 /libavcodec/h264_picture.c
parentc9ab8790118c1a57ca862927b7f642a3546ea3df (diff)
avcodec/h264_picture: Fix build without error resilience
Found-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_picture.c')
-rw-r--r--libavcodec/h264_picture.c4
1 files 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)
{