Michael Niedermayer 633b90ca8d 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>

2012-08-10 04:46:13 +02:00

77 KiB

Raw Blame History

View Raw