From 277691a130dcedbc3dfba2ab5ed3287a98dd1b57 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 26 May 2013 18:50:18 +0200 Subject: [PATCH] j2kdec: merge copyright header with jpeg2000 Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 * * This file is part of FFmpeg. *