Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 02:54:26 +0000 (04:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 02:54:26 +0000 (04:54 +0200)
commit624327988f747b1adc3a3d405418b0578b6c7e70
treefd2166657e89e0c2da153b5686027618a94fdc44
parent43935842bd1307b084a32ea40d2ed6c8733e034a
parente6e8be542b8e9f6c200b55dd1b444ec517dc85da
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Completely document the x264 options

Conflicts:
doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/encoders.texi