--- decoder.h 2003/06/09 01:16:12 1.13.2.2 +++ decoder.h 2003/06/28 15:49:02 1.13.2.5 @@ -1,16 +1,9 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Decoder header - + * - Decoder related header - * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. + * Copyright(C) 2002-2003 Peter Ross * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,14 +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 * - ****************************************************************************/ -/***************************************************************************** - * - * History - * - * - 13.06.2002 Added legal header - Cosmetic - * - * $Id: decoder.h,v 1.13.2.2 2003/06/09 01:16:12 edgomez Exp $ + * $Id: decoder.h,v 1.13.2.5 2003/06/28 15:49:02 chl Exp $ * ****************************************************************************/ @@ -115,6 +101,9 @@ int newpred_enable; int reduced_resolution_enable; + /* The bitstream version if it's a XviD stream */ + int bs_version; + /* image */ int fixed_dimensions; @@ -159,6 +148,7 @@ 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 */ }