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

Thu Apr 10 21:41:32 CEST 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 10 21:32:32 2014 +0200| [a4662cd6b11e59f419d2161a8cbe295efd8e7391] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Only set the SAR if it is valid
  libx265: Use 16-bit SAR
  libx265: Use x265_param_parse to set the SAR

See: 8945dcbb52b6b87e1e6479912cce89c7da54ec43
See: fcc43e02d30279b2ca4c69811311aa05acab4184
See: cdd21f1f03c5d59aad8f0244b1be0f864d8416a7
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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