Changeset f22bc68d in ffmpeg

Timestamp:

Oct 7, 2011, 1:32:30 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4052bf69

Parents:

355cc1a0 (diff), a85996d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (10/07/11 13:32:14)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/07/11 13:32:30)

Message:

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>

(No files)