| commit | 9d2dee8736edf9ae202cca3d27c7415dc9465c68 | |
| author | Nathan Caldwell <saintdev@gmail.com> | |
| Tue, 13 Oct 2009 19:24:22 +0000 (13 13:24 -0600) | ||
| committer | Nathan Caldwell <saintdev@gmail.com> | |
| Tue, 13 Oct 2009 19:24:22 +0000 (13 13:24 -0600) | ||
| tree | aa75859b2e111b9e85f1f671b72558400ea71dba | treesnapshot (tar.gz zip) |
| parent | 371ad0b2a1eafb8a68ddec688746fc37432c6e2d | commitdiff |
| parent | fc3b03ab6055b2a6c0789d7830b9125dc1300972 | commitdiff |
Merge branch 'lags-rac' into lagarith
Conflicts:
Changelog
libavcodec/avcodec.h
Conflicts:
Changelog
libavcodec/avcodec.h