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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/build_libstagefright | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/build_libstagefright b/tools/build_libstagefright index 583c801a56..a228487fb5 100644 --- a/tools/build_libstagefright +++ b/tools/build_libstagefright @@ -12,10 +12,10 @@ export PATH=$TOOLCHAIN/bin:$PATH ANDROID_SOURCE=$HOME/android ANDROID_LIBS=$HOME/glib -rm -rf ../build/libav -mkdir -p ../build/libav +rm -rf ../build/stagefright +mkdir -p ../build/stagefright -DEST=../build/libav +DEST=../build/stagefright FLAGS="--target-os=linux --cross-prefix=arm-linux-androideabi- --arch=arm --cpu=armv7-a" FLAGS="$FLAGS --sysroot=$SYSROOT" FLAGS="$FLAGS --disable-avdevice --disable-decoder=h264 --disable-decoder=h264_vdpau --enable-libstagefright-h264" |