j2k/jpeg2000: merge copyright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/22/merge
Michael Niedermayer 12 years ago
parent e708c7fa21
commit da90661718
  1. 1
      libavcodec/j2k.c
  2. 3
      libavcodec/j2k.h

@ -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.
*

@ -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.
*

Loading…
Cancel
Save