Merge commit '8a9de5c52401aa1e87bdb147524831c640d1ec53'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:24:29 +0000 (15:24 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:24:29 +0000 (15:24 +0100)
commitda7cfef7f0c98c05571c62d344aad83e0e85d0fb
treecbbd8dad5efd335adc6a64ea9b6503233a6cd468
parent5bc9c7a6db1caaae2bbc2061f16af28695a6fdd6
parent8a9de5c52401aa1e87bdb147524831c640d1ec53
Merge commit '8a9de5c52401aa1e87bdb147524831c640d1ec53'

* commit '8a9de5c52401aa1e87bdb147524831c640d1ec53':
  doc/encoders: document the QSV option mappings

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/encoders.texi