j2kdec: merge copyright header with jpeg2000
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 May 2013 16:50:18 +0000 (18:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 May 2013 18:15:50 +0000 (20:15 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/j2kdec.c

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