Merge branch 'master' of git://git.ffmpeg.org/ffmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Mar 2011 16:55:59 +0000 (17:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Mar 2011 16:55:59 +0000 (17:55 +0100)
commit27efa296c217dcd9d55354395e4f41991b7cc131
treeb9da73fee575598cccc7d486bdeabdb58e7f7971
parent3efbbbb5094a146efeb1f0613918ea97d31d00d2
parent0215006ab75be1f49fa8eacf2c6d3c1bd22edfc7
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
ffmpeg.c
libavcodec/Makefile
libavcodec/avcodec.h