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

media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc

Index: media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc
diff --git a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc
index 356ea4f80f21eb84226a19930787be67876580f4..5f59c9c60949f17fae0048b7d56744615b2f88a9 100644
--- a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc
+++ b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc
@@ -13,10 +13,10 @@
 namespace media {
 
 FFmpegH264ToAnnexBBitstreamConverter::FFmpegH264ToAnnexBBitstreamConverter(
-    AVCodecContext* stream_codec_context)
+    AVCodecParameters* stream_codec_parameters)
     : configuration_processed_(false),
-      stream_codec_context_(stream_codec_context) {
-  CHECK(stream_codec_context_);
+      stream_codec_parameters_(stream_codec_parameters) {
+  CHECK(stream_codec_parameters_);
 }
 
 FFmpegH264ToAnnexBBitstreamConverter::~FFmpegH264ToAnnexBBitstreamConverter() {}
@@ -29,16 +29,15 @@ bool FFmpegH264ToAnnexBBitstreamConverter::ConvertPacket(AVPacket* packet) {
 
   // Calculate the needed output buffer size.
   if (!configuration_processed_) {
-    if (!stream_codec_context_->extradata ||
-        stream_codec_context_->extradata_size <= 0)
+    if (!stream_codec_parameters_->extradata ||
+        stream_codec_parameters_->extradata_size <= 0)
       return false;
 
     avc_config.reset(new mp4::AVCDecoderConfigurationRecord());
 
-    if (!converter_.ParseConfiguration(
-            stream_codec_context_->extradata,
-            stream_codec_context_->extradata_size,
-            avc_config.get())) {
+    if (!converter_.ParseConfiguration(stream_codec_parameters_->extradata,
+                                       stream_codec_parameters_->extradata_size,
+                                       avc_config.get())) {
       return false;
     }
   }