summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS4
1 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 4227123685..1265aeed53 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -498,6 +498,10 @@ Melanson, Mike (tmmm) <melanson@pcisys.net>
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