--- decoder.h 2003/06/09 13:50:02 1.13.2.3 +++ decoder.h 2003/11/30 16:13:15 1.13.2.7 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: decoder.h,v 1.13.2.3 2003/06/09 13:50:02 edgomez Exp $ + * $Id: decoder.h,v 1.13.2.7 2003/11/30 16:13:15 edgomez Exp $ * ****************************************************************************/ @@ -81,6 +81,7 @@ uint32_t shape; uint32_t quant_bits; uint32_t quant_type; + uint16_t *mpeg_quant_matrices; int32_t quarterpel; int complexity_estimation_disable; ESTIMATION estimation; @@ -101,6 +102,9 @@ int newpred_enable; int reduced_resolution_enable; + /* The bitstream version if it's a XviD stream */ + int bs_version; + /* image */ int fixed_dimensions; @@ -142,10 +146,11 @@ uint32_t low_delay_default; /* default value for low_delay flag */ /* for GMC: central place for all parameters */ - + IMAGE gmc; /* gmc tmp buffer, remove for blockbased compensation */ GMC_DATA gmc_data; - + NEW_GMC_DATA new_gmc_data; + xvid_image_t* out_frm; /* This is used for slice rendering */ } DECODER;