diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 17:46:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 17:46:49 +0200 |
| commit | d2a847c203b5876e2bb5f0bc216b0af625f077a2 (patch) | |
| tree | d1e3d92d01a65b0629c4d0f58f3f00e43de3eb3f /Changelog | |
| parent | 9fa47cb77371fe93ba7081d33e49e53765c17aa7 (diff) | |
| parent | e7f9aa6ff5c850df173784d88ef8c79b22513d96 (diff) | |
| download | ffmpeg-d2a847c203b5876e2bb5f0bc216b0af625f077a2.tar.gz | |
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>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -51,7 +51,7 @@ easier to use. The changes are: - Speex encoder via libspeex - JSON output in ffprobe - WTV muxer -- C++ Support +- Optional C++ Support (needed for libstagefright) - H.264 Decoding on Android via Stagefright |