Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Mar 2011 15:53:58 +0000 (16:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Mar 2011 16:22:52 +0000 (17:22 +0100)
commit0fecf2642b9d909820683647c70031a954f5e58d
tree36ca02de9fa27a049829fb589517223d2d0ce5f5
parente309fdc7018a1027d187ec27fb1d69a41a4ee167
parentf1f60f5252b0b448adcce0c1c52f3161ee69b9bf
Merge remote-tracking branch 'newdev/master'

Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
69 files changed:
Changelog
cmdutils.c
configure
doc/APIchanges
doc/developer.texi
doc/faq.texi
doc/filters.texi
doc/git-howto.txt
doc/indevs.texi
doc/libavfilter.texi
doc/optimization.txt
libavcodec/dsputil.h
libavcodec/utils.c
libavformat/4xm.c
libavformat/aiffdec.c
libavformat/amr.c
libavformat/anm.c
libavformat/ape.c
libavformat/applehttp.c
libavformat/applehttpproto.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/avio.h
libavformat/aviobuf.c
libavformat/bethsoftvid.c
libavformat/bfi.c
libavformat/cafdec.c
libavformat/daud.c
libavformat/dxa.c
libavformat/electronicarts.c
libavformat/ffmdec.c
libavformat/filmstripdec.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/gxf.c
libavformat/id3v2.c
libavformat/idcin.c
libavformat/idroqdec.c
libavformat/iff.c
libavformat/img2.c
libavformat/ipmovie.c
libavformat/lxfdec.c
libavformat/matroskadec.c
libavformat/mmf.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mpc8.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/msnwc_tcp.c
libavformat/mxfdec.c
libavformat/ncdec.c
libavformat/nsvdec.c
libavformat/nutdec.c
libavformat/nuv.c
libavformat/qcp.c
libavformat/rmdec.c
libavformat/soxdec.c
libavformat/spdifdec.c
libavformat/swfdec.c
libavformat/tmv.c
libavformat/txd.c
libavformat/utils.c
libavformat/vc1test.c
libavformat/wav.c
libavformat/wc3movie.c
libavformat/wtv.c
libavformat/wv.c
version.sh