Merge remote-tracking branch 'remotes/newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Mar 2011 13:59:51 +0000 (14:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Mar 2011 14:00:52 +0000 (15:00 +0100)
commit3efbbbb5094a146efeb1f0613918ea97d31d00d2
tree5801f0fc784c2f00e0d8f70f0d3543e562fe5fb2
parent2800e8d62e4c6cdd8a7e218cb15a10f216946f18
parent35d7d6f7489c75aaa2fcb39820fb25b0fd44524b
Merge remote-tracking branch 'remotes/newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h