Merge remote-tracking branch 'hexene/scratchpad'
* hexene/scratchpad:
Move & Rename buildscript, remove tabs
Fix regular build
Support (H/W accelerated) H.264 decoding on Android via Stagefright
Add build-script for Android
C++ Support ;)
Conflicts:
Changelog
Makefile
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
libavcodec/libstagefright.cpp
0 → 100644
tools/build_libstagefright
0 → 100644
想要评论请 注册 或 登录