[FFmpeg-cvslog] Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 23 11:23:30 2015 +0100| [0425e16d96cccf6de32231ecfc37cde72985dde5] | committer: Michael Niedermayer

Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'

* commit '521979e6b1e7a89751aebc285a40d6508f8af48f':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
	configure

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

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