Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lags-rac
commitb7199822c708a8ad54b581d2a6a1902a0ebe024d
authorNathan Caldwell <saintdev@gmail.com>
Tue, 1 Sep 2009 07:11:59 +0000 (1 01:11 -0600)
committerNathan Caldwell <saintdev@gmail.com>
Tue, 1 Sep 2009 07:11:59 +0000 (1 01:11 -0600)
tree98010d772ec1b0167e12cfd8d3d3d26abbecd914
parentaa1edca96da819fc5b8be590c8a84c64c7b424c9
parentf98710bbbf5b747c4bb01d00484d156b05d20e5e
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lags-rac