z3ntu

gnash ffmpeg 4.0 patch

May 12th, 2018
486
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.02 KB | None | 0 0
  1. diff --git a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
  2. index 127aaaa08..216d96b1f 100644
  3. --- a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
  4. +++ b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
  5. @@ -149,7 +149,7 @@ MediaHandlerFfmpeg::cameraNames(std::vector<std::string>& /*names*/) const
  6.  size_t
  7.  MediaHandlerFfmpeg::getInputPaddingSize() const
  8.  {
  9. -    return FF_INPUT_BUFFER_PADDING_SIZE;
  10. +    return AV_INPUT_BUFFER_PADDING_SIZE;
  11.  }
  12.  
  13.  } // gnash.media.ffmpeg namespace
  14. diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
  15. index 9ceb8b022..a27ca56c7 100644
  16. --- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
  17. +++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
  18. @@ -64,7 +64,7 @@ AVInputFormat*
  19.  MediaParserFfmpeg::probeStream()
  20.  {
  21.      const size_t probeSize = 4096;
  22. -    const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE;
  23. +    const size_t bufSize = probeSize + AV_INPUT_BUFFER_PADDING_SIZE;
  24.  
  25.         std::unique_ptr<std::uint8_t[]> buffer(new std::uint8_t[bufSize]);
  26.  
  27. @@ -173,7 +173,7 @@ MediaParserFfmpeg::parseVideoFrame(AVPacket& packet)
  28.  
  29.         // TODO: We might avoid the copy as a whole by making EncodedVideoFrame
  30.         //       virtual.
  31. -       size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
  32. +       size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE;
  33.         std::uint8_t* data = new std::uint8_t[allocSize];
  34.         std::copy(packet.data, packet.data+packet.size, data);
  35.         std::unique_ptr<EncodedVideoFrame> frame(new EncodedVideoFrame(data, packet.size, 0, timestamp));
  36. @@ -221,7 +221,7 @@ MediaParserFfmpeg::parseAudioFrame(AVPacket& packet)
  37.  
  38.         // TODO: We might avoid the copy as a whole by making EncodedAudioFrame
  39.         //       virtual.
  40. -       size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
  41. +       size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE;
  42.         std::uint8_t* data = new std::uint8_t[allocSize];
  43.         std::copy(packet.data, packet.data+packet.size, data);
Advertisement
Add Comment
Please, Sign In to add comment