[FFmpeg-cvslog] Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 13 21:36:14 2014 +0200| [3d7218d932923e2b964fef37e8993fd0a6df7c1d] | committer: Michael Niedermayer

Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
	common.mak
	configure
	libavdevice/Makefile
	libavfilter/Makefile

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

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