Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Mar 2011 15:18:40 +0000 (16:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Mar 2011 15:48:42 +0000 (16:48 +0100)
commit6947b0c42e0649f0c8355442d1732d642e467902
treebffb2d72049108372cbe46273998f3790dc860f0
parent27293b840ccae95ddb1f4d8af519e7962b0e373d
parentc76374c6db5f486672f9df223f43e4892bd655c9
Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay.c
libavformat/applehttp.c
libavformat/applehttpproto.c
libavformat/asfdec.c
libavformat/avio.h
libavformat/aviobuf.c
libavformat/dsicin.c
libavformat/mxg.c
libavformat/utils.c
libavformat/wtv.c