Conflicts:
ext/jpeg/gstjpegdec.c
/* clear parse state */
dec->saw_header = FALSE;
dec->parse_resync = FALSE;
- dec->parse_offset = 0;
toadd = offset + 4;
goto have_full_frame;
}
/* Skip this frame if we found another SOI marker */
GST_DEBUG ("0x%08x: SOI marker before EOI, skipping", offset + 2);
dec->parse_resync = FALSE;
- dec->parse_offset = 0;
/* FIXME : Need to skip data */
toadd -= offset + 2;
goto have_full_frame;
GstJpegDec *dec = (GstJpegDec *) bdec;
dec->error_count = 0;
- dec->parse_offset = 0;
dec->parse_entropy_len = 0;
dec->parse_resync = FALSE;
/* parse state */
gboolean saw_header;
- gint parse_offset;
gint parse_entropy_len;
gint parse_resync;