# HG changeset patch
# User diego
# Date 1095785993 0
# Node ID 4971840361a56cdd8fae51cb1288b3cf449442a9
# Parent  4a3df690da14e2a69ea4084cc8ebce88efcc3bfc
credit for Loren Merritt, patch by himself

diff -r 4a3df690da14 -r 4971840361a5 AUTHORS
--- a/AUTHORS	Tue Sep 21 13:38:19 2004 +0000
+++ b/AUTHORS	Tue Sep 21 16:59:53 2004 +0000
@@ -498,6 +498,10 @@
 von Merkatz, Arwed <v.merkatz@gmx.net>
     * fontconfig font lookup support
 
+Merritt, Loren <lorenm@u.washington.edu>
+    * x264 encoding support
+    * some libavcodec documentation
+
 Mierzejewski, Dominik (Rathann) <dominik@rangers.eu.org>
     * compiler warning fixes
     * official Red Hat RPM packages