]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 40963ea e82cbb6)
Merge remote-tracking branch 'hexene/stagefright'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Oct 2011 15:54:22 +0000 (17:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Oct 2011 16:04:02 +0000 (18:04 +0200)
commit072a62b50ab4e54ee55585dc06a8e313d713b39f
tree5c0783e7bc4d63936a17d12989edd1e2daf341c3tree | snapshot
parent40963ea9e9f8fbc178673c963f1d9662f3f20cfbcommit | diff
parente82cbb69a768205d0bea2fc5b97377dff35d5e72commit | diff
Merge remote-tracking branch 'hexene/stagefright'

* hexene/stagefright:
  tools/build_libstagefright: fetch android system headers and libraries
  libstagefright: reindent after previous commit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libstagefright.cpp diff1 | diff2 | blob | history
tools/build_libstagefright diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.