[FFmpeg-cvslog] Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 22 02:45:45 2014 +0200| [dac096cf39d24735f1992b7d867519f17974865b] | committer: Michael Niedermayer

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
  build: Support executable only ldflags

Conflicts:
	Makefile

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

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