From 3536c9b77abf3c6eb5891343163789a0a314c69f Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 21 Sep 2004 16:59:53 +0000
Subject: [PATCH] credit for Loren Merritt, patch by himself

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13423 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 AUTHORS | 4 ++++
 1 file changed, 4 insertions(+)

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