Merge branch 'develop' into avcodec
authorPaul Brossier <piem@piem.org>
Thu, 5 Dec 2013 13:06:55 +0000 (08:06 -0500)
committerPaul Brossier <piem@piem.org>
Thu, 5 Dec 2013 13:06:55 +0000 (08:06 -0500)
commit75eb1824f4c60323a0a4ec7660ce38423ebab0a5
tree5d9ced3907a1c2c9c4a4b3b74a30957fdae666f2
parent6abb4deb79388539bc9266f623f06503810a3c74
parent294aff65731e7f2d5148376d6dad31743ed24008
Merge branch 'develop' into avcodec
tests/src/io/test-source_sndfile.c