[FFmpeg-cvslog] Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 23 11:10:25 2015 +0100| [69c32456a045235c67243515384666c741b7e8e6] | committer: Michael Niedermayer

Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'

* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7':
  configure: Use pkg-config for libdc1394 discovery

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69c32456a045235c67243515384666c741b7e8e6
---