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>

diff --cc configure
index a70f3fcd63bad87c388ea1438c9b418d4e375571,8b87ad48241009c3e62848b7cf404fedc6d4d9e5..075229d44136f1e8d30de3c3eac8fead41a6d25e
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3201,10 -2951,8 +3201,10 @@@ enabled libschroedinger && require_pkg_
  enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex
  enabled libstagefright_h264  && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h
      media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h
-     media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder
+     media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static
  enabled libtheora  && require  libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
 +enabled libutvideo    && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++
 +enabled libv4l2    && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
  enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc
  enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
  enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg

diff --cc libavcodec/libstagefright.cpp
Simple merge

diff --cc tools/build_libstagefright
index 78c20841ee5b1cdc5138a34e06436690bc9b1018,8b3a0930f9c19b98542023f02473acbe86966dd0..8b3a0930f9c19b98542023f02473acbe86966dd0
mode 100644,100755..100644
--- 1/tools/build_libstagefright
--- 2/tools/build_libstagefright
+++ b/tools/build_libstagefright