Merge remote-tracking branch 'hexene/scratchpad'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Sep 2011 23:23:16 +0000 (01:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Sep 2011 23:23:16 +0000 (01:23 +0200)
commit15240feb992b6b41ca4afba928b9cb6edb0dc9fb
tree32426c5114bb571a7dba06412ac737a66c1bdd0a
parentf27f68eb4f7cb43a4d023ce5d1ebd2292313bd9f
parent9c29ab58517cae8d56c7ed7fd5070d8f8c8d429e
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: Michael Niedermayer <michaelni@gmx.at>
Changelog
Makefile
common.mak
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tools/build_libstagefright