[SCM] libav/experimental: h264: fix build when error resilience is disabled

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ca1e36a8e4cd416142487071dbca734567bdaddf
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:   Fri Jun 20 12:48:06 2014 -0400

    h264: fix build when error resilience is disabled

diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index b35cc52..1d7461b 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;

-- 
Libav/FFmpeg packaging