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)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h

Simple merge