OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9692674 0db9eba)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Aug 2012 02:46:13 +0000 (04:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Aug 2012 02:46:13 +0000 (04:46 +0200)
commit633b90ca8d5fbdac4e54b0d6b054e273b3a5efa5
tree9c351711a68105bf554ee1153b0e4c59f9dae87atree | snapshot
parent969267482de97b08503d27d2fe090ec820273e40commit | diff
parent0db9eba48c8a27bc2373d02edda3340ef6f0e5fccommit | diff
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>
Makefile diff1 | diff2 | blob | history
libavcodec/motion_est.c diff1 | diff2 | blob | history
libavcodec/qdm2.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help