Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lagarith
commit0bae79451dc67a7d6d46dfb8ac3eca2ee68ae5b0
authorNathan Caldwell <saintdev@gmail.com>
Mon, 3 Aug 2009 20:19:57 +0000 (3 14:19 -0600)
committerNathan Caldwell <saintdev@gmail.com>
Mon, 3 Aug 2009 20:19:57 +0000 (3 14:19 -0600)
tree46317139d20b1ba9c84c4f3a885c8528618d6361
parent165f6f965e6dd1b5a66ac8b086d71206676204da
parent4cee6280c2ed876b8c1438ee85f06bb01608a7c9
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lagarith
libavcodec/Makefile