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