diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-07-04 18:20:35 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-07-04 18:20:35 +0000 |
| commit | 643fd8a198ddb67225f5edd503f8f151d13635a3 (patch) | |
| tree | d9e9cae67913c6c562d581673fe6b5ec235af9b1 /libavcodec/mjpegdec.h | |
| parent | b27bf2a7b4fd57c36eccb11f5af794d4b940cfdc (diff) | |
| download | ffmpeg-643fd8a198ddb67225f5edd503f8f151d13635a3.tar.gz | |
Add a got_picture flag to MJpegDecodeContext which indicates if its picture
element is valid. Skip the code handling SOS and EOI if not, since it can not
work without a valid AVPicture.
This fixes a crash with mjpeg/smclockmjpeg.avi.1.0 from issue 1240 where the
decoder returned an invalid AVPicture.
Originally committed as revision 19342 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpegdec.h')
| -rw-r--r-- | libavcodec/mjpegdec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 5a77759b3c..9ef8987db3 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -81,6 +81,7 @@ typedef struct MJpegDecodeContext { int quant_index[4]; /* quant table index for each component */ int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ AVFrame picture; /* picture structure */ + int got_picture; ///< we found a SOF and picture is valid, too. int linesize[MAX_COMPONENTS]; ///< linesize << interlaced int8_t *qscale_table; DECLARE_ALIGNED_16(DCTELEM, block[64]); |