opusenc: fixup merge
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 30 Mar 2012 15:09:34 +0000 (17:09 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 30 Mar 2012 15:09:34 +0000 (17:09 +0200)
commitaf14e951c1a84cb2a3178bb714c96af758c1ceb1
tree071aeb7b5a86b086c7d7f546e2cd8292878392ba
parentf473e02c09cdc6fc7a149b17cc17057e82f19b77
opusenc: fixup merge
ext/opus/gstopusenc.c