[FFmpeg-cvslog] Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 18 20:35:06 2015 +0100| [77c133f7ac526a32fc99d4abc8313984fcfd1a82] | committer: Michael Niedermayer

Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'

* commit 'd617e77cecc5b363ef1860955b548f4ac007add6':
  libx265: Add crf private option

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

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