mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 14:45:29 +00:00
cc70f90133
The update script landed without code to apply the patch files we're carrying against upstream. It's better to do that automatically so there's less to remember when doing an update. Also add a patch apparently missing from the existing set to remove a spurious declaration for 'writeSimpleBock'.
17 lines
693 B
Diff
17 lines
693 B
Diff
diff --git a/third_party/libmkv/WebMElement.h b/third_party/libmkv/WebMElement.h
|
|
index d9ad0a0..717e739 100644
|
|
--- a/third_party/libmkv/WebMElement.h
|
|
+++ b/third_party/libmkv/WebMElement.h
|
|
@@ -10,11 +10,6 @@
|
|
#ifndef MKV_CONTEXT_HPP
|
|
#define MKV_CONTEXT_HPP 1
|
|
|
|
-void writeSimpleBock(EbmlGlobal *ebml, unsigned char trackNumber, unsigned short timeCode,
|
|
- int isKeyframe, unsigned char lacingFlag, int discardable,
|
|
- unsigned char *data, unsigned long dataLength);
|
|
-
|
|
-
|
|
// these are helper functions
|
|
void writeHeader(EbmlGlobal *ebml);
|
|
void writeSegmentInformation(EbmlGlobal *ebml, EbmlLoc *startInfo, unsigned long timeCodeScale, double duration);
|