[FFmpeg-cvslog] Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 20 03:33:30 2014 +0200| [9e6769d2dc7bb33a2317b85fb55239958119e78c] | committer: Michael Niedermayer

Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

* commit 'afe176265480880e1f702c96a8ba434b0d88728b':
  build: export library dependencies in ${name}_FFLIBS

Conflicts:
	common.mak

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

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