[svn] / trunk / xvidcore / src / bitstream / bitstream.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/bitstream/bitstream.c

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

revision 1927, Tue Dec 28 16:34:55 2010 UTC revision 1928, Tue Dec 28 19:19:57 2010 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: bitstream.c,v 1.60 2010-12-18 16:02:00 Isibaar Exp $   * $Id: bitstream.c,v 1.61 2010-12-28 19:19:43 Isibaar Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 1258  Line 1258 
1258          /* divx5 userdata string */          /* divx5 userdata string */
1259  #define DIVX5_ID ((char *)"DivX503b1393")  #define DIVX5_ID ((char *)"DivX503b1393")
1260    if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {    if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {
1261      BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));      BitstreamWriteUserData(bs, DIVX5_ID, (uint32_t)strlen(DIVX5_ID));
1262          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))
1263        BitstreamPutBits(bs, 'p', 8);        BitstreamPutBits(bs, 'p', 8);
1264          }          }
# Line 1271  Line 1271 
1271                                  xvid_user_format,                                  xvid_user_format,
1272                                  XVID_BS_VERSION,                                  XVID_BS_VERSION,
1273                                  (frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0');                                  (frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0');
1274                  BitstreamWriteUserData(bs, xvid_user_data, strlen(xvid_user_data));                  BitstreamWriteUserData(bs, xvid_user_data, (uint32_t)strlen(xvid_user_data));
1275          }          }
1276  }  }
1277    
# Line 1392  Line 1392 
1392                                                  const char *data,                                                  const char *data,
1393                                                  const unsigned int length)                                                  const unsigned int length)
1394  {  {
1395          int i;          unsigned int i;
1396    
1397          BitstreamPad(bs);          BitstreamPad(bs);
1398          BitstreamPutBits(bs, USERDATA_START_CODE, 32);          BitstreamPutBits(bs, USERDATA_START_CODE, 32);

Legend:
Removed from v.1927  
changed lines
  Added in v.1928

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