| commit | 3c2e7db167c65663799b729e3b2fdade37cee47b | |
| author | Nathan Caldwell <saintdev@gmail.com> | |
| Sun, 2 Aug 2009 01:05:44 +0000 (1 19:05 -0600) | ||
| committer | Nathan Caldwell <saintdev@gmail.com> | |
| Sun, 2 Aug 2009 01:05:44 +0000 (1 19:05 -0600) | ||
| tree | cc6041f911ef009e6a63b1be5fd0d255958e009c | treesnapshot (tar.gz zip) |
| parent | e544be95e18c9b41a7cdcf613bec2cc81db3bf52 | commitdiff |
| parent | 286d8e676cb471e8ee678de1dd30a99cf42498f3 | commitdiff |
Merge commit 'ffmpeg/master' into lagarith
Conflicts:
Changelog
Conflicts:
Changelog
| Changelog | diff1 | diff2 | blobhistory |
| doc/general.texi | diff1 | diff2 | blobhistory |
| libavcodec/Makefile | diff1 | diff2 | blobhistory |