Changeset 7ed002d7 in ffmpeg

Timestamp:

Aug 6, 2013, 12:56:22 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8878aef0

Parents:

1dfb34d (diff), 22a154e4 (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/06/13 12:56:14)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/06/13 12:56:22)

Message:

Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'

• commit '22a154e4363b351dd9f321003de01dffebd2fa18': build: Add missing img2.o dependency to apetag.o

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

(No files)