generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'hexene/scratchpad'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-09-14 17:46:49 +02:00
parent 9fa47cb773 e7f9aa6ff5
commit d2a847c203
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/build_libstagefright
View File

@@ -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"