[FFmpeg-cvslog] j2kdec: merge copyright header with jpeg2000

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 26 18:50:18 2013 +0200| [277691a130dcedbc3dfba2ab5ed3287a98dd1b57] | committer: Michael Niedermayer

j2kdec: merge copyright header with jpeg2000

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

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

 libavcodec/j2kdec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index d387a6a..6e72829 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -1,6 +1,7 @@
 /*
- * JPEG2000 image decoder
+ * JPEG 2000 image decoder
  * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu at gmail.com>
  *
  * This file is part of FFmpeg.
  *