From fde7ee8710e9278af29e1e17f7023bb84a837573 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 28 Feb 2017 18:35:10 +0100
Subject: [PATCH 1/2] x86: hevc: Add missing colons after assembly labels

This fixes several warnings of the sort
warning: label alone on a line without a colon might be in error
---
 libavcodec/x86/hevc_add_res.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/x86/hevc_add_res.asm b/libavcodec/x86/hevc_add_res.asm
index 66b929c594..4701e9d45d 100644
--- a/libavcodec/x86/hevc_add_res.asm
+++ b/libavcodec/x86/hevc_add_res.asm
@@ -330,7 +330,7 @@ cglobal hevc_add_residual_32_10, 3, 5, 6
     mova              m5, [max_pixels_10]
 
     mov              r4d, 32
-.loop
+.loop:
     ADD_RES_SSE_32_10 r0, r1
     lea               r0, [r0+r2]
     add               r1, 64
@@ -346,7 +346,7 @@ cglobal hevc_add_residual_16_10, 3, 5, 6
     lea                r3, [r2*3]
 
     mov               r4d, 4
-.loop
+.loop:
     ADD_RES_AVX2_16_10 r0, r2, r3, r1
     lea                r0, [r0+r2*4]
     add                r1, 128
@@ -359,7 +359,7 @@ cglobal hevc_add_residual_32_10, 3, 5, 6
     mova               m5, [max_pixels_10]
 
     mov               r4d, 16
-.loop
+.loop:
     ADD_RES_AVX2_32_10 r0, r2, r1
     lea                r0, [r0+r2*2]
     add                r1, 128

From 58407b4d74c99e30dbd40fe468c69dbd25ea4255 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 28 Feb 2017 19:01:28 +0100
Subject: [PATCH 2/2] configure: Fix typo in objcc default setting

Also drop stray duplicate OBJCC config.mak entry.
---
 configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure b/configure
index 5af7df3057..d3921da31c 100755
--- a/configure
+++ b/configure
@@ -2991,7 +2991,7 @@ fi
 
 ar_default="${cross_prefix}${ar_default}"
 cc_default="${cross_prefix}${cc_default}"
-occ_default="${cross_prefix}${occ_default}"
+objcc_default="${cross_prefix}${objcc_default}"
 nm_default="${cross_prefix}${nm_default}"
 pkg_config_default="${cross_prefix}${pkg_config_default}"
 ranlib="${cross_prefix}${ranlib}"
@@ -5321,7 +5321,6 @@ CC_IDENT=$cc_ident
 ARCH=$arch
 INTRINSICS=$intrinsics
 CC=$cc
-OBJCC=$cc
 AS=$as
 OBJCC=$objcc
 LD=$ld