| xvid.h | xvid.h | |||
|---|---|---|---|---|
| skipping to change at line 22 | skipping to change at line 22 | |||
| * | * | |||
| * This program is distributed in the hope that it will be useful, | * This program is distributed in the hope that it will be useful, | |||
| * but WITHOUT ANY WARRANTY ; without even the implied warranty of | * but WITHOUT ANY WARRANTY ; without even the implied warranty of | |||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| * GNU General Public License for more details. | * GNU General Public License for more details. | |||
| * | * | |||
| * You should have received a copy of the GNU General Public License | * You should have received a copy of the GNU General Public License | |||
| * along with this program ; if not, write to the Free Software | * along with this program ; if not, write to the Free Software | |||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | |||
| * | * | |||
| * $Id: xvid.h,v 1.51.2.2 2005/11/22 21:01:33 edgomez Exp $ | * $Id: xvid.h,v 1.51.2.4 2006/11/01 10:17:27 Isibaar Exp $ | |||
| * | * | |||
| ************************************************************************** **/ | ************************************************************************** **/ | |||
| #ifndef _XVID_H_ | #ifndef _XVID_H_ | |||
| #define _XVID_H_ | #define _XVID_H_ | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| extern "C" { | extern "C" { | |||
| #endif | #endif | |||
| skipping to change at line 59 | skipping to change at line 59 | |||
| #define XVID_MAKE_VERSION(a,b,c) ((((a)&0xff)<<16) | (((b)&0xff)<<8) | ((c) &0xff)) | #define XVID_MAKE_VERSION(a,b,c) ((((a)&0xff)<<16) | (((b)&0xff)<<8) | ((c) &0xff)) | |||
| #define XVID_VERSION_MAJOR(a) ((char)(((a)>>16) & 0xff)) | #define XVID_VERSION_MAJOR(a) ((char)(((a)>>16) & 0xff)) | |||
| #define XVID_VERSION_MINOR(a) ((char)(((a)>> 8) & 0xff)) | #define XVID_VERSION_MINOR(a) ((char)(((a)>> 8) & 0xff)) | |||
| #define XVID_VERSION_PATCH(a) ((char)(((a)>> 0) & 0xff)) | #define XVID_VERSION_PATCH(a) ((char)(((a)>> 0) & 0xff)) | |||
| #define XVID_MAKE_API(a,b) ((((a)&0xff)<<16) | (((b)&0xff)<<0)) | #define XVID_MAKE_API(a,b) ((((a)&0xff)<<16) | (((b)&0xff)<<0)) | |||
| #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) | #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) | |||
| #define XVID_API_MINOR(a) (((a)>> 0) & 0xff) | #define XVID_API_MINOR(a) (((a)>> 0) & 0xff) | |||
| #define XVID_VERSION XVID_MAKE_VERSION(1,1,0) | #define XVID_VERSION XVID_MAKE_VERSION(1,1,2) | |||
| #define XVID_API XVID_MAKE_API(4, 1) | #define XVID_API XVID_MAKE_API(4, 1) | |||
| /* Bitstream Version | /* Bitstream Version | |||
| * this will be writen into the bitstream to allow easy detection of xvid | * this will be writen into the bitstream to allow easy detection of xvid | |||
| * encoder bugs in the decoder, without this it might not possible to | * encoder bugs in the decoder, without this it might not possible to | |||
| * automatically distinquish between a file which has been encoded with an | * automatically distinquish between a file which has been encoded with an | |||
| * old & buggy XVID from a file which has been encoded with a bugfree versi on | * old & buggy XVID from a file which has been encoded with a bugfree versi on | |||
| * see the infamous interlacing bug ... | * see the infamous interlacing bug ... | |||
| * | * | |||
| * this MUST be increased if an encoder bug is fixed, increasing it too oft en | * this MUST be increased if an encoder bug is fixed, increasing it too oft en | |||
| * doesnt hurt but not increasing it could cause difficulty for decoders in the | * doesnt hurt but not increasing it could cause difficulty for decoders in the | |||
| * future | * future | |||
| */ | */ | |||
| #define XVID_BS_VERSION 41 | #define XVID_BS_VERSION 46 | |||
| /************************************************************************** *** | /************************************************************************** *** | |||
| * error codes | * error codes | |||
| ************************************************************************** **/ | ************************************************************************** **/ | |||
| /* all functions return values <0 indicate error */ | /* all functions return values <0 indicate error */ | |||
| #define XVID_ERR_FAIL -1 /* general fault */ | #define XVID_ERR_FAIL -1 /* general fault */ | |||
| #define XVID_ERR_MEMORY -2 /* memory allocation error */ | #define XVID_ERR_MEMORY -2 /* memory allocation error */ | |||
| #define XVID_ERR_FORMAT -3 /* file format error */ | #define XVID_ERR_FORMAT -3 /* file format error */ | |||
| End of changes. 3 change blocks. | ||||
| 3 lines changed or deleted | 3 lines changed or added | |||