Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 23:38:19 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 23:39:36 +0000 (00:39 +0100)
* qatar/master:
  libopusenc: Change default frame duration to 20 ms

See: 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge