mirror of
https://git.freebsd.org/ports.git
synced 2025-07-04 10:59:14 -04:00
f3db8f6ed6
ffmpeg/MediaHandlerFfmpeg.cpp:152:12: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
return FF_INPUT_BUFFER_PADDING_SIZE;
^
ffmpeg/MediaParserFfmpeg.cpp:67:40: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE;
^
ffmpeg/MediaParserFfmpeg.cpp:176:35: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
^
ffmpeg/MediaParserFfmpeg.cpp:224:35: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
^
PR: 227726
53 lines
2.5 KiB
Text
53 lines
2.5 KiB
Text
ffmpeg/MediaHandlerFfmpeg.cpp:152:12: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
|
|
return FF_INPUT_BUFFER_PADDING_SIZE;
|
|
^
|
|
ffmpeg/MediaParserFfmpeg.cpp:67:40: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
|
|
const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE;
|
|
^
|
|
ffmpeg/MediaParserFfmpeg.cpp:176:35: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
|
|
size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
|
|
^
|
|
ffmpeg/MediaParserFfmpeg.cpp:224:35: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
|
|
size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
|
|
^
|
|
|
|
--- libmedia/ffmpeg/MediaHandlerFfmpeg.cpp.orig 2016-07-21 12:25:09 UTC
|
|
+++ libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
|
|
@@ -149,7 +149,7 @@ MediaHandlerFfmpeg::cameraNames(std::vector<std::strin
|
|
size_t
|
|
MediaHandlerFfmpeg::getInputPaddingSize() const
|
|
{
|
|
- return FF_INPUT_BUFFER_PADDING_SIZE;
|
|
+ return AV_INPUT_BUFFER_PADDING_SIZE;
|
|
}
|
|
|
|
} // gnash.media.ffmpeg namespace
|
|
--- libmedia/ffmpeg/MediaParserFfmpeg.cpp.orig 2016-07-21 12:25:09 UTC
|
|
+++ libmedia/ffmpeg/MediaParserFfmpeg.cpp
|
|
@@ -64,7 +64,7 @@ AVInputFormat*
|
|
MediaParserFfmpeg::probeStream()
|
|
{
|
|
const size_t probeSize = 4096;
|
|
- const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE;
|
|
+ const size_t bufSize = probeSize + AV_INPUT_BUFFER_PADDING_SIZE;
|
|
|
|
std::unique_ptr<std::uint8_t[]> buffer(new std::uint8_t[bufSize]);
|
|
|
|
@@ -173,7 +173,7 @@ MediaParserFfmpeg::parseVideoFrame(AVPacket& packet)
|
|
|
|
// TODO: We might avoid the copy as a whole by making EncodedVideoFrame
|
|
// virtual.
|
|
- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
|
|
+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE;
|
|
std::uint8_t* data = new std::uint8_t[allocSize];
|
|
std::copy(packet.data, packet.data+packet.size, data);
|
|
std::unique_ptr<EncodedVideoFrame> frame(new EncodedVideoFrame(data, packet.size, 0, timestamp));
|
|
@@ -221,7 +221,7 @@ MediaParserFfmpeg::parseAudioFrame(AVPacket& packet)
|
|
|
|
// TODO: We might avoid the copy as a whole by making EncodedAudioFrame
|
|
// virtual.
|
|
- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
|
|
+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE;
|
|
std::uint8_t* data = new std::uint8_t[allocSize];
|
|
std::copy(packet.data, packet.data+packet.size, data);
|
|
|