Merge remote-tracking branch 'qatar/master'

* qatar/master:
  motion_est: drop inline from sad_hpel_motion_search()
  motion_est: remove unused macros
  motion_est: remove useless no_motion_search() function
  lagarith: frame multithreading
  doxygen: qdm2: Drop documentation for non-existing function parameters
  build: add HOSTOBJS to SUBDIR_VARS list

Conflicts:
	Makefile

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

diff --cc Makefile
index b61f4eb,d2aed23..e722561
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -72,8 -106,7 +72,8 @@@ SUBDIR_VARS := CLEANFILES EXAMPLES FFLI
                 ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS             \
                 MMI-OBJS ALTIVEC-OBJS VIS-OBJS                            \
                 MMX-OBJS YASM-OBJS                                        \
-                OBJS TESTOBJS
 +               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS  \
+                OBJS HOSTOBJS TESTOBJS
  
  define RESET
  $(1) :=

diff --cc libavcodec/motion_est.c
Simple merge

diff --cc libavcodec/qdm2.c
Simple merge