[FFmpeg-cvslog] j2k/jpeg2000: merge copyright

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 26 17:45:15 2013 +0200| [da906617188a30cda550e0362105663215f04a2f] | committer: Michael Niedermayer

j2k/jpeg2000: merge copyright

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da906617188a30cda550e0362105663215f04a2f
---

 libavcodec/j2k.c |    1 +
 libavcodec/j2k.h |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c
index f5ee970..51ba788 100644
--- a/libavcodec/j2k.c
+++ b/libavcodec/j2k.c
@@ -1,6 +1,7 @@
 /*
  * JPEG2000 encoder and decoder common functions
  * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu at gmail.com>
  *
  * This file is part of FFmpeg.
  *
diff --git a/libavcodec/j2k.h b/libavcodec/j2k.h
index 2c94d05..85213aa 100644
--- a/libavcodec/j2k.h
+++ b/libavcodec/j2k.h
@@ -1,6 +1,7 @@
 /*
- * JPEG2000 tables
+ * JPEG 2000 common defines, structures and functions
  * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu at gmail.com>
  *
  * This file is part of FFmpeg.
  *