chromium-93-ffmpeg-4.4.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536
  1. diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
  2. index ac4713b07268..492a9a37d096 100644
  3. --- a/media/filters/ffmpeg_demuxer.cc
  4. +++ b/media/filters/ffmpeg_demuxer.cc
  5. @@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
  6. scoped_refptr<DecoderBuffer> buffer;
  7. if (type() == DemuxerStream::TEXT) {
  8. - size_t id_size = 0;
  9. + int id_size = 0;
  10. uint8_t* id_data = av_packet_get_side_data(
  11. packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
  12. - size_t settings_size = 0;
  13. + int settings_size = 0;
  14. uint8_t* settings_data = av_packet_get_side_data(
  15. packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
  16. @@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
  17. buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
  18. side_data.data(), side_data.size());
  19. } else {
  20. - size_t side_data_size = 0;
  21. + int side_data_size = 0;
  22. uint8_t* side_data = av_packet_get_side_data(
  23. packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
  24. @@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
  25. packet->size - data_offset);
  26. }
  27. - size_t skip_samples_size = 0;
  28. + int skip_samples_size = 0;
  29. const uint32_t* skip_samples_ptr =
  30. reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
  31. packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));