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)
commit0bad50522d34a16c0ce90a74b103ff768413148b
treeff10229bf062777ce74c094d51fc393b28d91f8c
parented1eb9602c962e2e7c5ef298c2e17c150dc2c912
parent63debaa74c9c159081bb40a9e659806385e1a5fe
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopusenc: Change default frame duration to 20 ms

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