media/libmkv/const_fix.patch

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

     1 diff --git a/WebMElement.c b/WebMElement.c
     2 --- a/WebMElement.c
     3 +++ b/WebMElement.c
     4 @@ -56,7 +56,7 @@
     5  }
     7  void writeVideoTrack(EbmlGlobal *glob, unsigned int trackNumber, int flagLacing,
     8 -                     char *codecId, unsigned int pixelWidth, unsigned int pixelHeight,
     9 +                     const char *codecId, unsigned int pixelWidth, unsigned int pixelHeight,
    10                       double frameRate) {
    11    EbmlLoc start;
    12    UInt64 trackID;
    13 @@ -79,7 +79,7 @@
    14    Ebml_EndSubElement(glob, &start); // Track Entry
    15  }
    16  void writeAudioTrack(EbmlGlobal *glob, unsigned int trackNumber, int flagLacing,
    17 -                     char *codecId, double samplingFrequency, unsigned int channels,
    18 +                     const char *codecId, double samplingFrequency, unsigned int channels,
    19                       unsigned char *private, unsigned long privateSize) {
    20    EbmlLoc start;
    21    UInt64 trackID;
    22 diff --git a/WebMElement.h b/WebMElement.h
    23 --- a/WebMElement.h
    24 +++ b/WebMElement.h
    25 @@ -20,10 +20,10 @@
    26  void writeSegmentInformation(EbmlGlobal *ebml, EbmlLoc *startInfo, unsigned long timeCodeScale, double duration);
    27  // this function is a helper only, it assumes a lot of defaults
    28  void writeVideoTrack(EbmlGlobal *ebml, unsigned int trackNumber, int flagLacing,
    29 -                     char *codecId, unsigned int pixelWidth, unsigned int pixelHeight,
    30 +                     const char *codecId, unsigned int pixelWidth, unsigned int pixelHeight,
    31                       double frameRate);
    32  void writeAudioTrack(EbmlGlobal *glob, unsigned int trackNumber, int flagLacing,
    33 -                     char *codecId, double samplingFrequency, unsigned int channels,
    34 +                     const char *codecId, double samplingFrequency, unsigned int channels,
    35                       unsigned char *private_, unsigned long privateSize);
    37  void writeSimpleBlock(EbmlGlobal *ebml, unsigned char trackNumber, short timeCode,

mercurial