diff options
Diffstat (limited to 'libavcodec/mjpegdec.h')
-rw-r--r-- | libavcodec/mjpegdec.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index bfa987d..f35f20a 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -4,20 +4,20 @@ * Copyright (c) 2003 Alex Beregszaszi * Copyright (c) 2003-2004 Michael Niedermayer * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -58,6 +58,9 @@ typedef struct MJpegDecodeContext { int ls; int progressive; int rgb; + int upscale_h; + int chroma_height; + int upscale_v; int rct; /* standard rct */ int pegasus_rct; /* pegasus reversible colorspace transform */ int bits; /* bits per component */ @@ -65,7 +68,7 @@ typedef struct MJpegDecodeContext { int maxval; int near; ///< near lossless bound (si 0 for lossless) int t1,t2,t3; - int reset; ///< context halfing intervall ?rename + int reset; ///< context halfing interval ?rename int width, height; int mb_width, mb_height; |