[FFmpeg-cvslog] Merge remote-tracking branch 'hexene/scratchpad'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 14 17:46:49 2011 +0200| [d2a847c203b5876e2bb5f0bc216b0af625f077a2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2a847c203b5876e2bb5f0bc216b0af625f077a2
---