Changeset 66328da7 in ffmpeg

Timestamp:

Aug 6, 2013, 5:33:46 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

aa24729c

Parents:

c32db6a (diff), 6fb65973 (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.

Message:

Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'

• commit '6fb65973c9501d3fe94a5a9195c01cd20083066e': configure: Properly split dv1394 indev dependencies

Conflicts:

configure

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

(No files)