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)
* hexene/stagefright:
  tools/build_libstagefright: fetch android system headers and libraries
  libstagefright: reindent after previous commit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libstagefright.cpp
tools/build_libstagefright

Simple merge
index a228487fb59c282899b7ce0ab659943d3fa47465,ada8d4e23933ded74ce06bf39ece6e23b150aace..ada8d4e23933ded74ce06bf39ece6e23b150aace
mode 100644,100755..100644