Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Mar 2011 16:58:49 +0000 (17:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Mar 2011 16:58:58 +0000 (17:58 +0100)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/asfdec.c
libavformat/avformat.h

Simple merge
Simple merge