Merge remote-tracking branch 'hexene/scratchpad'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Sep 2011 15:46:49 +0000 (17:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Sep 2011 15:46:49 +0000 (17:46 +0200)
commitd2a847c203b5876e2bb5f0bc216b0af625f077a2
treed1e3d92d01a65b0629c4d0f58f3f00e43de3eb3f
parent9fa47cb77371fe93ba7081d33e49e53765c17aa7
parente7f9aa6ff5c850df173784d88ef8c79b22513d96
Merge remote-tracking branch 'hexene/scratchpad'

* hexene/scratchpad:
  libstagefright: Explicitly free smart pointer objects
  Changelog: Explain why C++ support is added, and that its optional
  tools/build_libstagefright: rename build/libav to something neutral

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
tools/build_libstagefright