Merge remote-tracking branch 'hexene/stagefright'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Oct 2011 13:32:14 +0000 (15:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Oct 2011 13:32:30 +0000 (15:32 +0200)
* hexene/stagefright:
  libstagefright: start decode_thread() only after decode_frame() is called at least once.
  libstagefright: mark the dummy frame as keyframe.
  libstagefright: limit the output queue size
  libstagefright: return EOS if CustomSource::read() is called after decode_thread() returns
  libstagefright: set the correct frame size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libstagefright.cpp

Simple merge