Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 05:48:51 +0000 (07:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 05:49:38 +0000 (07:49 +0200)
commit97f7586cd6a1c3741258d6d70b3cbbbde15b1618
treee2ce5e0dd62a1f2d3e88ec0cf94c3c168303e018
parent9c66da517f3e967895ec830dd5b89262b48873d1
parent5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d
Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/smacker.c