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)
* 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>
1  2 
Changelog
tools/build_libstagefright

diff --cc Changelog
+++ b/Changelog
@@@ -43,15 -41,8 +43,15 @@@ easier to use. The changes are
        '-preset <presetname>'.
      * -intra option was removed, it's equivalent to -g 0.
  - XMV demuxer
 +- LOAS demuxer
 +- ashowinfo filter added
  - Windows Media Image decoder
- - C++ Support
 +- amovie source added
 +- LATM muxer
 +- Speex encoder via libspeex
 +- JSON output in ffprobe
 +- WTV muxer
+ - Optional C++ Support (needed for libstagefright)
  - H.264 Decoding on Android via Stagefright