[FFmpeg-cvslog] Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 23 22:46:06 2014 +0200| [2e3c1699aea7bb5a72d18903f4b8d3d33964c14d] | committer: Michael Niedermayer

Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'

* commit '749b1f1359b5af0a08221923b016551b18ab6171':
  configure: add --enable-rpath

Conflicts:
	configure

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

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