[cvs] / xvidcore / src / bitstream / bitstream.h Repository:
ViewVC logotype

Diff of /xvidcore/src/bitstream/bitstream.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.17.2.8, Wed Nov 19 15:46:55 2003 UTC revision 1.18, Fri Apr 4 22:16:15 2003 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Bitstream reader/writer inlined functions and constants-   *  - Bitstream reader/writer inlined functions and constants-
5   *   *
6   *  Copyright (C) 2001-2003 Peter Ross <pross@xvid.org>   *  Copyright (C) 2001-2003 - Peter Ross <pross@xvid.org>
7   *   *
8   *  This program is free software ; you can redistribute it and/or modify   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
9   *  it under the terms of the GNU General Public License as published by   *
10     *  XviD is free software; you can redistribute it and/or modify it
11     *  under the terms of the GNU General Public License as published by
12   *  the Free Software Foundation ; either version 2 of the License, or   *  the Free Software Foundation ; either version 2 of the License, or
13   *  (at your option) any later version.   *  (at your option) any later version.
14   *   *
# Line 58  Line 60 
60    
61  #define VIDOBJLAY_TYPE_SIMPLE                   1  #define VIDOBJLAY_TYPE_SIMPLE                   1
62  /*#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2 */  /*#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2 */
63  /*#define VIDOBJLAY_TYPE_CORE                           3 */  #define VIDOBJLAY_TYPE_CORE                             3
64  /*#define VIDOBJLAY_TYPE_MAIN                           4 */  #define VIDOBJLAY_TYPE_MAIN                             4
65  /*#define VIDOBJLAY_TYPE_NBIT                           5 */  /*#define VIDOBJLAY_TYPE_NBIT                           5 */
66  /*#define VIDOBJLAY_TYPE_ANIM_TEXT                      6 */  /*#define VIDOBJLAY_TYPE_ANIM_TEXT                      6 */
67  /*#define VIDOBJLAY_TYPE_ANIM_MESH                      7 */  /*#define VIDOBJLAY_TYPE_ANIM_MESH                      7 */
# Line 67  Line 69 
69  /*#define VIDOBJLAY_TYPE_STILL_SCALABLE         9 */  /*#define VIDOBJLAY_TYPE_STILL_SCALABLE         9 */
70  #define VIDOBJLAY_TYPE_ART_SIMPLE               10  #define VIDOBJLAY_TYPE_ART_SIMPLE               10
71  /*#define VIDOBJLAY_TYPE_CORE_SCALABLE          11 */  /*#define VIDOBJLAY_TYPE_CORE_SCALABLE          11 */
72  /*#define VIDOBJLAY_TYPE_ACE                            12 */  #define VIDOBJLAY_TYPE_ACE                              12
73  /*#define VIDOBJLAY_TYPE_ADVANCED_SCALABLE_TEXTURE 13 */  /*#define VIDOBJLAY_TYPE_SIMPLE_FBA                     13 */
 /*#define VIDOBJLAY_TYPE_SIMPLE_FBA                     14 */  
 /*#define VIDEOJLAY_TYPE_SIMPLE_STUDIO    15*/  
 /*#define VIDEOJLAY_TYPE_CORE_STUDIO      16*/  
 #define VIDOBJLAY_TYPE_ASP              17  
 /*#define VIDOBJLAY_TYPE_FGS              18*/  
74    
75    
76  /*#define VIDOBJLAY_AR_SQUARE           1 */  /*#define VIDOBJLAY_AR_SQUARE           1 */
# Line 137  Line 134 
134    
135    
136  void BitstreamWriteVolHeader(Bitstream * const bs,  void BitstreamWriteVolHeader(Bitstream * const bs,
137                                                           const MBParam * pParam);                                                           const MBParam * pParam,
138                                                             const FRAMEINFO * const frame);
139    
140  void BitstreamWriteVopHeader(Bitstream * const bs,  void BitstreamWriteVopHeader(Bitstream * const bs,
141                                                           const MBParam * pParam,                                                           const MBParam * pParam,
142                                                           const FRAMEINFO * const frame,                                                           const FRAMEINFO * const frame,
143                                                           int vop_coded,                                                           int vop_coded);
                                                          unsigned int quant);  
144    
145  void BitstreamWriteUserData(Bitstream * const bs,  void BitstreamWriteUserData(Bitstream * const bs,
146                                                          uint8_t * data,                                                          uint8_t * data,

Legend:
Removed from v.1.17.2.8  
changed lines
  Added in v.1.18

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4