diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-05-02 14:44:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-05-03 21:34:22 +0200 |
| commit | 9fd06a363987aa56a79db2532266c6218b1ca343 (patch) | |
| tree | eafa1cb386f7e950c77a0184dd4230a2bdeb2a48 /libavcodec/mjpegdec.h | |
| parent | 4b1e1f706b15f1ed68e351c5924d28c15d2fc763 (diff) | |
Revert "avcodec/mjpegdec: postpone calling ff_get_buffer() until the SOS marker"
This also temporary disables fate-jpegls which is re-enabled in the next commit
This reverts commit c8197f73e684b0edc450f3dc2b2b4b3fb9dedd0d.
Diffstat (limited to 'libavcodec/mjpegdec.h')
| -rw-r--r-- | libavcodec/mjpegdec.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 71cacb0b27..2400a179f1 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -109,7 +109,6 @@ typedef struct MJpegDecodeContext { int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ AVFrame *picture; /* picture structure */ AVFrame *picture_ptr; /* pointer to picture structure */ - int seen_sof; ///< we found a SOF. int got_picture; ///< we found a SOF and picture is valid, too. int linesize[MAX_COMPONENTS]; ///< linesize << interlaced int8_t *qscale_table; @@ -166,9 +165,7 @@ typedef struct MJpegDecodeContext { enum AVPixelFormat hwaccel_sw_pix_fmt; enum AVPixelFormat hwaccel_pix_fmt; void *hwaccel_picture_private; - struct JLSState *jls_state; - uint32_t palette[AVPALETTE_COUNT]; } MJpegDecodeContext; int ff_mjpeg_build_vlc(VLC *vlc, const uint8_t *bits_table, |