diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 04:46:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 04:46:13 +0200 |
| commit | 633b90ca8d5fbdac4e54b0d6b054e273b3a5efa5 (patch) | |
| tree | 9c351711a68105bf554ee1153b0e4c59f9dae87a /Makefile | |
| parent | 969267482de97b08503d27d2fe090ec820273e40 (diff) | |
| parent | 0db9eba48c8a27bc2373d02edda3340ef6f0e5fc (diff) | |
| download | ffmpeg-streaming-633b90ca8d5fbdac4e54b0d6b054e273b3a5efa5.zip ffmpeg-streaming-633b90ca8d5fbdac4e54b0d6b054e273b3a5efa5.tar.gz | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -73,7 +73,7 @@ SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ MMI-OBJS ALTIVEC-OBJS VIS-OBJS \ MMX-OBJS YASM-OBJS \ MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS \ - OBJS TESTOBJS + OBJS HOSTOBJS TESTOBJS define RESET $(1) := |
