Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:10:25 +0000 (11:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:10:56 +0000 (11:10 +0100)
* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7':
  configure: Use pkg-config for libdc1394 discovery

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
Simple merge