[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  7 00:15:15 2014 +0100| [0707a34dd8173deee141762c68bd8cf845abe610] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Support API version 9

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

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