diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
| commit | efbc9d9043ff8ff92716ddd00a5f61412d535593 (patch) | |
| tree | 8f3e621f756cf1f5b4d64d97964c7e7abd8aaf08 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h | |
| parent | df6b139a6d9027156f614b68687e039e3a5854db (diff) | |
revert r1783
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h index 0a2f92428..b786d8e77 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h @@ -35,8 +35,7 @@ #define MAX_COMPONENTS 4 -typedef struct MJpegDecodeContext -{ +typedef struct MJpegDecodeContext { AVCodecContext *avctx; GetBitContext gb; @@ -62,7 +61,7 @@ typedef struct MJpegDecodeContext int maxval; int near; ///< near lossless bound (si 0 for lossless) - int t1, t2, t3; + int t1,t2,t3; int reset; ///< context halfing intervall ?rename int width, height; @@ -86,7 +85,7 @@ typedef struct MJpegDecodeContext int linesize[MAX_COMPONENTS]; ///< linesize << interlaced int8_t *qscale_table; DECLARE_ALIGNED_16(DCTELEM, block)[64]; - DCTELEM(*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive mode) + DCTELEM (*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive mode) uint8_t *last_nnz[MAX_COMPONENTS]; uint64_t coefs_finished[MAX_COMPONENTS]; ///< bitmask of which coefs have been completely decoded (progressive mode) ScanTable scantable; |