Commit Graph

4 Commits

Author SHA1 Message Date
Michael Niedermayer
d2a847c203 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>
2011-09-14 17:46:49 +02:00
Michael Niedermayer
b5824233fb tools/build_libstagefright: rename build/libav to something neutral
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-14 19:51:18 +05:30
Michael Niedermayer
15240feb99 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>
2011-09-14 01:23:16 +02:00
Mohamed Naufal
9c29ab5851 Move & Rename buildscript, remove tabs 2011-09-09 23:14:36 +05:30