Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: fix tests for 2-arg math functions
  doc: git-howto: Clarify comment about pushing series of commits
  ivi_common: Drop unused function parameter from decode_band()
  cook: Remove some silly Doxygen comments
  cook: Remove senseless maybe_reformat_buffer32() function
  cook: cosmetics: Better names for joint_decode() function parameters
  cook: cosmetics: Better name for ccpl COOKSubpacket member
  doxygen: Add av_alloc_size to list of predefined macros
  doxygen: Drop some pointless entries from PREDEFINED macros list
  h263: avoid memcpys over array bound in motion vector caching for obmc

Conflicts:
	configure
	doc/git-howto.texi
	libavcodec/cook.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 12 insertions, 26 deletions

diff --git a/configure b/configure
index 65562516a8..7f9fe4f0b7 100755
--- a/configure
+++ b/configure
@@ -852,23 +852,13 @@ EOF
 check_mathfunc(){
     log check_mathfunc "$@"
     func=$1
-    shift
-    disable $func
-    check_ld "cc" "$@" <<EOF && enable $func
-#include <math.h>
-float foo(float f) { return $func(f); }
-int main(void){ return (int) foo; }
-EOF
-}
-
-check_math2func(){
-    log check_math2func "$@"
-    func=$1
-    shift
+    narg=$2
+    shift 2
+    test $narg = 2 && args="f, g" || args="f"
     disable $func
     check_ld "cc" "$@" <<EOF && enable $func
 #include <math.h>
-float foo(float f) { return $func(f, f); }
+float foo(float f, float g) { return $func($args); }
 int main(void){ return (int) foo; }
 EOF
 }
@@ -1279,6 +1269,7 @@ HAVE_LIST_PUB='
 
 MATH_FUNCS="
     atanf
+    atan2f
     cbrtf
     cosf
     exp2
@@ -1286,6 +1277,7 @@ MATH_FUNCS="
     expf
     isinf
     isnan
+    ldexpf
     llrint
     llrintf
     log2
@@ -1293,6 +1285,7 @@ MATH_FUNCS="
     log10f
     lrint
     lrintf
+    powf
     rint
     round
     roundf
@@ -1301,12 +1294,6 @@ MATH_FUNCS="
     truncf
 "
 
-MATH2_FUNCS="
-    atan2f
-    ldexpf
-    powf
-"
-
 HAVE_LIST="
     $ARCH_EXT_LIST
     $(add_suffix _external $ARCH_EXT_LIST)
@@ -1315,7 +1302,6 @@ HAVE_LIST="
     $HAVE_LIST_PUB
     $THREADS_LIST
     $MATH_FUNCS
-    $MATH2_FUNCS
     aligned_malloc
     aligned_stack
     alsa_asoundlib_h
@@ -3671,12 +3657,12 @@ check_lib math.h sin -lm && LIBM="-lm"
 disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
 enabled vaapi && require vaapi va/va.h vaInitialize -lva
 
-for func in $MATH_FUNCS; do
-    check_mathfunc $func
-done
+atan2f_args=2
+ldexpf_args=2
+powf_args=2
 
-for func in $MATH2_FUNCS; do
-    check_math2func $func
+for func in $MATH_FUNCS; do
+    eval check_mathfunc $func \${${func}_args:-1}
 done
 
 # these are off by default, so fail if requested and not available