Merge branch 'avcodec' into develop
authorPaul Brossier <piem@piem.org>
Fri, 6 Dec 2013 19:39:41 +0000 (14:39 -0500)
committerPaul Brossier <piem@piem.org>
Fri, 6 Dec 2013 19:39:41 +0000 (14:39 -0500)

Trivial merge