aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-26 18:50:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-26 20:15:50 +0200
commit277691a130dcedbc3dfba2ab5ed3287a98dd1b57 (patch)
tree495504d0865ffddd10ae61bf3c1b04eb58996d06 /libavcodec
parenta2daf929edff09e15461bd8af395693c27ed37ae (diff)
downloadffmpeg-277691a130dcedbc3dfba2ab5ed3287a98dd1b57.tar.gz
j2kdec: merge copyright header with jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/j2kdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index d387a6acfb..6e728291f6 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@gmail.com>
*
* This file is part of FFmpeg.
*