[FFmpeg-cvslog] Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 19:33:46 2013 +0200| [66328da700c73246e2d4c5254905f9e5b4e0fa31] | committer: Michael Niedermayer

Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'

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

Conflicts:
	configure

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

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