summaryrefslogtreecommitdiffstats
path: root/ext/jpeg/gstjpegdec.h
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2005-08-11 15:02:37 +0000
committerTim-Philipp Müller <tim@centricular.net>2005-08-11 15:02:37 +0000
commit2c39e571142cae79fc910c359e2d6ff479299cd2 (patch)
tree607dfdad6a4ecec66291f54c0bf128987259ed0d /ext/jpeg/gstjpegdec.h
parenta0074faed3276544260eaa9c9428d02c6384080d (diff)
ext/jpeg/gstjpegdec.*: Fix crashes/invalid memory access for pictures that have a height that is not a multiple of 16...
Original commit message from CVS: * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_init), (gst_jpeg_dec_chain), (gst_jpeg_dec_change_state): * ext/jpeg/gstjpegdec.h: Fix crashes/invalid memory access for pictures that have a height that is not a multiple of 16 (or rather: v_samp_factor * DCTSIZE). Also fix the state change function for downwards state changes (need to chain up to parent before destroying our resources, to make sure pads get deactivated and our chain function isn't running and using those very same resources in another thread). The jpeg line buffer only needs to be v_samp_factor*DCTSIZE lines per plane, not picture_height lines; allocate that on the stack.
Diffstat (limited to 'ext/jpeg/gstjpegdec.h')
-rw-r--r--ext/jpeg/gstjpegdec.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/ext/jpeg/gstjpegdec.h b/ext/jpeg/gstjpegdec.h
index b14582db..8bfe8287 100644
--- a/ext/jpeg/gstjpegdec.h
+++ b/ext/jpeg/gstjpegdec.h
@@ -76,13 +76,8 @@ struct _GstJpegDec {
guint64 next_ts;
/* video state */
- guint width;
- guint height;
gdouble fps;
- /* the jpeg line buffer */
- guchar **line[3];
-
struct jpeg_decompress_struct cinfo;
struct GstJpegDecErrorMgr jerr;
struct GstJpegDecSourceMgr jsrc;