To M56: Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits).

media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc

Index: media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc
diff --git a/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc b/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc
index 08b5082c473bcdb4ed76209b53cbdb4fce469cf8..045713aea8f2d46aac619337a8397b2681e4ecc9 100644
--- a/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc
+++ b/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc
@@ -16,9 +16,9 @@
 namespace media {
 
 FFmpegH265ToAnnexBBitstreamConverter::FFmpegH265ToAnnexBBitstreamConverter(
-    AVCodecContext* stream_codec_context)
-    : stream_codec_context_(stream_codec_context) {
-  CHECK(stream_codec_context_);
+    AVCodecParameters* stream_codec_parameters)
+    : stream_codec_parameters_(stream_codec_parameters) {
+  CHECK(stream_codec_parameters_);
 }
 
 FFmpegH265ToAnnexBBitstreamConverter::~FFmpegH265ToAnnexBBitstreamConverter() {}
@@ -30,17 +30,16 @@ bool FFmpegH265ToAnnexBBitstreamConverter::ConvertPacket(AVPacket* packet) {
 
   // Calculate the needed output buffer size.
   if (!hevc_config_) {
-    if (!stream_codec_context_->extradata ||
-        stream_codec_context_->extradata_size <= 0) {
+    if (!stream_codec_parameters_->extradata ||
+        stream_codec_parameters_->extradata_size <= 0) {
       DVLOG(1) << "HEVCDecoderConfiguration not found, no extra codec data";
       return false;
     }
 
     hevc_config_.reset(new mp4::HEVCDecoderConfigurationRecord());
 
-    if (!hevc_config_->Parse(
-            stream_codec_context_->extradata,
-            stream_codec_context_->extradata_size)) {
+    if (!hevc_config_->Parse(stream_codec_parameters_->extradata,
+                             stream_codec_parameters_->extradata_size)) {
       DVLOG(1) << "Parsing HEVCDecoderConfiguration failed";
       return false;
     }