Changeset 072a62b5 in ffmpeg

Timestamp:

Oct 13, 2011, 4:04:02 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a2af9012

Parents:

40963ea9 (diff), e82cbb69 (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/13/11 15:54:22)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/13/11 16:04:02)

Message:

Merge remote-tracking branch 'hexene/stagefright'

• hexene/stagefright: tools/build_libstagefright: fetch android system headers and libraries libstagefright: reindent after previous commit

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)