Changeset 6067186f in ffmpeg

Timestamp:

Aug 24, 2013, 9:30:57 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7495186f

Parents:

edf6fb64 (diff), f4078569 (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> (08/24/13 09:30:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/24/13 09:30:57)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder

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

(No files)