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)
commit4eb41d16bee406d1481d412639230510015ea708
treec6fa80c3b060c6a71c43082802974163c911663b
parent12bcfe05b45175cc7fc5cc719392c35ee5a3c39c
parent350785a6621529c50771f4e7043b4d159a96ed26
Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/asfdec.c
libavformat/avformat.h