media/libmkv/bock_fix.patch

Thu, 15 Jan 2015 21:03:48 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 15 Jan 2015 21:03:48 +0100
branch
TOR_BUG_9701
changeset 11
deefc01c0e14
permissions
-rw-r--r--

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

     1 diff --git a/third_party/libmkv/WebMElement.h b/third_party/libmkv/WebMElement.h
     2 index d9ad0a0..717e739 100644
     3 --- a/third_party/libmkv/WebMElement.h
     4 +++ b/third_party/libmkv/WebMElement.h
     5 @@ -10,11 +10,6 @@
     6  #ifndef MKV_CONTEXT_HPP
     7  #define MKV_CONTEXT_HPP 1
     9 -void writeSimpleBock(EbmlGlobal *ebml, unsigned char trackNumber, unsigned short timeCode,
    10 -                     int isKeyframe, unsigned char lacingFlag, int  discardable,
    11 -                     unsigned char *data, unsigned long dataLength);
    12 -
    13 -
    14  // these are helper functions
    15  void writeHeader(EbmlGlobal *ebml);
    16  void writeSegmentInformation(EbmlGlobal *ebml, EbmlLoc *startInfo, unsigned long timeCodeScale, double duration);

mercurial