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