1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Michael Niedermayer d2a847c203 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>
2011-09-14 17:46:49 +02:00
..
2011-05-12 13:02:58 +02:00