]>
Commit | Line | Data |
---|---|---|
5ccd3511 JR |
1 | --- ffms2-2.20/src/core/matroskareader.cpp~ 2014-06-20 17:09:10.000000000 +0200 |
2 | +++ ffms2-2.20/src/core/matroskareader.cpp 2018-04-29 09:42:31.607973790 +0200 | |
3 | @@ -301,8 +301,8 @@ | |
4 | } | |
5 | ||
6 | void MatroskaReaderContext::Append(const void *Data, size_t Length) { | |
7 | - if (BufferSize < Length + FrameSize + FF_INPUT_BUFFER_PADDING_SIZE) { | |
8 | - size_t NewSize = (FrameSize + Length) * 2 + FF_INPUT_BUFFER_PADDING_SIZE; | |
9 | + if (BufferSize < Length + FrameSize + AV_INPUT_BUFFER_PADDING_SIZE) { | |
10 | + size_t NewSize = (FrameSize + Length) * 2 + AV_INPUT_BUFFER_PADDING_SIZE; | |
11 | safe_aligned_reallocz(Buffer, BufferSize, NewSize); | |
12 | BufferSize = NewSize; | |
13 | } | |
14 | @@ -340,5 +340,5 @@ | |
15 | } | |
16 | ||
17 | if (FrameSize) | |
18 | - memset(Buffer + FrameSize, 0, FF_INPUT_BUFFER_PADDING_SIZE); | |
19 | + memset(Buffer + FrameSize, 0, AV_INPUT_BUFFER_PADDING_SIZE); | |
20 | } | |
21 | --- ffms2-2.20/src/core/utils.cpp~ 2018-04-29 09:41:45.000000000 +0200 | |
22 | +++ ffms2-2.20/src/core/utils.cpp 2018-04-29 09:43:06.088381421 +0200 | |
23 | @@ -173,7 +173,7 @@ | |
24 | // but I don't think anyone actually uses that. | |
25 | ||
26 | if (PrivateDataSrc && PrivateDataSize > 0) { | |
27 | - CodecContext->extradata = static_cast<uint8_t *>(av_mallocz(PrivateDataSize + FF_INPUT_BUFFER_PADDING_SIZE)); | |
28 | + CodecContext->extradata = static_cast<uint8_t *>(av_mallocz(PrivateDataSize + AV_INPUT_BUFFER_PADDING_SIZE)); | |
29 | CodecContext->extradata_size = PrivateDataSize; | |
30 | memcpy(CodecContext->extradata, PrivateDataSrc, PrivateDataSize); | |
31 | } |