diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 17:45:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 18:07:48 +0200 |
| commit | da906617188a30cda550e0362105663215f04a2f (patch) | |
| tree | 725c118124a29b52972e8bf48bf97488efd5326e /libavcodec | |
| parent | e708c7fa214d862853fc32a30e63c67bb726ccb3 (diff) | |
| download | ffmpeg-da906617188a30cda550e0362105663215f04a2f.tar.gz | |
j2k/jpeg2000: merge copyright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/j2k.c | 1 | ||||
| -rw-r--r-- | libavcodec/j2k.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c index f5ee97085a..51ba78862e 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@gmail.com> * * This file is part of FFmpeg. * diff --git a/libavcodec/j2k.h b/libavcodec/j2k.h index 2c94d05ebe..85213aa64d 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@gmail.com> * * This file is part of FFmpeg. * |