[FFmpeg-cvslog] Merge commit '3f1f6053013d0015e9f115a91a11744807649a07'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 09:32:47 2015 +0200| [59b55619b6edef363532825c4cf16ac2bfdd21a1] | committer: Hendrik Leppkes

Merge commit '3f1f6053013d0015e9f115a91a11744807649a07'

* commit '3f1f6053013d0015e9f115a91a11744807649a07':
  configure: address a copy-paste typo

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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