| commit | dfc10900a50aedb1ff3cce62a8e5aba10eb60358 | |
| author | Nathan Caldwell <saintdev@gmail.com> | |
| Thu, 6 Aug 2009 21:00:50 +0000 (6 15:00 -0600) | ||
| committer | Nathan Caldwell <saintdev@gmail.com> | |
| Thu, 6 Aug 2009 21:00:50 +0000 (6 15:00 -0600) | ||
| tree | d1552e93bd205db078f077767958d02b8a13c48a | treesnapshot (tar.gz zip) |
| parent | 74f157ad7ec43023f61115dc3cf1223e923304a4 | commitdiff |
| parent | 5e01ad4a56f694cc4201f966c0b0ae3953b9d7a7 | commitdiff |
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lagarith
Conflicts:
Changelog
Conflicts:
Changelog
| Changelog | diff1 | diff2 | blobhistory |
| libavcodec/Makefile | diff1 | diff2 | blobhistory |