Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Oct 2nd, 2012  |  syntax: Diff  |  size: 1.89 KB  |  views: 63  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -ru ffms-2.17-src/src/core/matroskaparser.c ffms-2.17-src.orig/src/core/matroskaparser.c
  2. --- ffms-2.17-src/src/core/matroskaparser.c     2011-01-27 21:38:25.000000000 +0100
  3. +++ ffms-2.17-src.orig/src/core/matroskaparser.c        2012-10-02 21:45:42.000000000 +0200
  4. @@ -91,6 +91,7 @@
  5.  #define        MAXU64                ULL(0xffffffffffffffff)
  6.  #define        ONE                   ULL(1)
  7.  
  8. +
  9.  // compatibility
  10.  static char  *mystrdup(struct InputStream *is,const char *src) {
  11.    size_t  len;
  12. @@ -1366,9 +1367,9 @@
  13.        readLangCC(mf, len, t.Language);
  14.        break;
  15.      case 0x86: // CodecID
  16. -      if (t.CodecID)
  17. +      if (t.AVCodecID)
  18.         errorjmp(mf,"Duplicate CodecID");
  19. -      STRGETA(mf,t.CodecID,len);
  20. +      STRGETA(mf,t.AVCodecID,len);
  21.        break;
  22.      case 0x63a2: // CodecPrivate
  23.        if (cp)
  24. @@ -1459,7 +1460,7 @@
  25.    ENDFOR(mf);
  26.  
  27.    // validate track info
  28. -  if (!t.CodecID)
  29. +  if (!t.AVCodecID)
  30.      errorjmp(mf,"Track has no Codec ID");
  31.  
  32.    if (t.UID != 0) {
  33. @@ -1525,8 +1526,8 @@
  34.    // copy strings
  35.    if (t.Name)
  36.      cpadd += strlen(t.Name)+1;
  37. -  if (t.CodecID)
  38. -    cpadd += strlen(t.CodecID)+1;
  39. +  if (t.AVCodecID)
  40. +    cpadd += strlen(t.AVCodecID)+1;
  41.  
  42.    tp = mf->cache->memalloc(mf->cache,sizeof(*tp) + cplen + cslen + cpadd);
  43.    if (tp == NULL)
  44. @@ -1546,7 +1547,7 @@
  45.  
  46.    cp = (char*)(tp+1) + cplen + cslen;
  47.    CopyStr(&tp->Name,&cp);
  48. -  CopyStr(&tp->CodecID,&cp);
  49. +  CopyStr(&tp->AVCodecID,&cp);
  50.  
  51.    // set default language
  52.    if (!tp->Language[0])
  53. diff -ru ffms-2.17-src/src/core/matroskaparser.h ffms-2.17-src.orig/src/core/matroskaparser.h
  54. --- ffms-2.17-src/src/core/matroskaparser.h     2010-11-28 03:28:40.000000000 +0100
  55. +++ ffms-2.17-src.orig/src/core/matroskaparser.h        2012-10-02 21:43:16.000000000 +0200
  56. @@ -161,7 +161,7 @@
  57.    /* various strings */
  58.    char                 *Name;
  59.    char                 Language[4];
  60. -  char                 *CodecID;
  61. +  char                 *AVCodecID;
  62.  };
  63.  
  64.  typedef struct TrackInfo  TrackInfo;