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)
commitf22bc68dc0de214ba893c15e2a5e80731ab19959
tree144ddcafadf2082b9afa86b6643d34b3db760c8b
parent355cc1a05263c6d3422ffbd4fbf027001f2807de
parenta85996d834ffa66a3d73c9d4610d078ec7f57e61
Merge remote-tracking branch 'hexene/stagefright'

* 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>
libavcodec/libstagefright.cpp