Changeset 8d87c0b3 in ffmpeg

Timestamp:

Dec 4, 2014, 12:52:01 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5fe026f2

Parents:

0f16ab18 (diff), 963aa1d (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> (12/04/14 00:47:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/04/14 00:52:01)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Fix standalone compilation of the iec61883 input device.

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

(No files)