diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 01:58:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 01:58:30 +0200 |
| commit | 74e4bb691254e9d473bf1eac63ee7da4bbf0957e (patch) | |
| tree | 9367a1092fd619d9a45a43bcd1df6d76674e08ea /tools | |
| parent | dddd06d5b48664212ace4bb510757e9bb221b598 (diff) | |
| parent | f51b7e52a6b31e98a82ce48dddac9cabc1e62e04 (diff) | |
| download | ffmpeg-74e4bb691254e9d473bf1eac63ee7da4bbf0957e.tar.gz | |
Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
libstagefright: avoid memory leak
libstagefright: support more output pixel formats
libstagefright: avoid potential deadlock on output MediaBuffer
libstagefright: explicitly set positive timestamps as stagefright expects them so
Merge branches 'stagefright' and 'stagefright-test' into stagefright-test
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 78c20841ee..8b3a0930f9 100644 --- a/tools/build_libstagefright +++ b/tools/build_libstagefright @@ -28,6 +28,7 @@ TOOLCHAIN=`echo $NDK/toolchains/arm-linux-androideabi-4.4.3/prebuilt/*-x86` export PATH=$TOOLCHAIN/bin:$PATH ANDROID_SOURCE=../android-source ANDROID_LIBS=../android-libs +ABI="armeabi-v7a" rm -rf ../build/stagefright mkdir -p ../build/stagefright @@ -40,12 +41,11 @@ FLAGS="$FLAGS --disable-avdevice --disable-decoder=h264 --disable-decoder=h264_v EXTRA_CFLAGS="-I$ANDROID_SOURCE/frameworks/base/include -I$ANDROID_SOURCE/system/core/include" EXTRA_CFLAGS="$EXTRA_CFLAGS -I$ANDROID_SOURCE/frameworks/base/media/libstagefright" EXTRA_CFLAGS="$EXTRA_CFLAGS -I$ANDROID_SOURCE/frameworks/base/include/media/stagefright/openmax" -EXTRA_CFLAGS="$EXTRA_CFLAGS -I$NDK/sources/cxx-stl/system/include" +EXTRA_CFLAGS="$EXTRA_CFLAGS -I$NDK/sources/cxx-stl/gnu-libstdc++/include -I$NDK/sources/cxx-stl/gnu-libstdc++/libs/$ABI/include" EXTRA_CFLAGS="$EXTRA_CFLAGS -march=armv7-a -mfloat-abi=softfp -mfpu=neon" -EXTRA_LDFLAGS="-Wl,--fix-cortex-a8 -L$ANDROID_LIBS -Wl,-rpath-link,$ANDROID_LIBS" +EXTRA_LDFLAGS="-Wl,--fix-cortex-a8 -L$ANDROID_LIBS -Wl,-rpath-link,$ANDROID_LIBS -L$NDK/sources/cxx-stl/gnu-libstdc++/libs/$ABI" EXTRA_CXXFLAGS="-Wno-multichar -fno-exceptions -fno-rtti" -ABI="armeabi-v7a" DEST="$DEST/$ABI" FLAGS="$FLAGS --prefix=$DEST" |