Show
Ignore:
Timestamp:
05/22/08 16:45:06 (6 months ago)
Author:
astrange
Message:

Merge trunk to 1.1 branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/perian-1.1

    • Property svn:externals changed from
      ffmpeg -r11099 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r1297 http://svn.matroska.org/svn/matroska/trunk/libebml
      libmatroska -r1297 http://svn.matroska.org/svn/matroska/trunk/libmatroska
      a52codec -r61 http://svn.cod3r.com/a52codec/trunk
       to
      ffmpeg -r 13239 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r 1306 https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska -r 1306 https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec -r 64 http://svn.cod3r.com/a52codec/trunk

  • branches/perian-1.1/Codecprintf.h

    r214 r887  
    1414#ifdef DEBUG_BUILD 
    1515int Codecprintf(FILE *, const char *format, ...); 
    16 void FourCCprintf(char *string, unsigned long a); 
     16void FourCCprintf(char *string, FourCharCode a); 
     17const char *FourCCString(FourCharCode c); 
    1718#else 
    1819#define Codecprintf(file, fmt, ...) /**/