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

media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h

Index: media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
diff --git a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
index 6e3064747fa4c1c597a6053d0c89002798f164bb..f15f4928a43fd7975ae27c69fa2df9bd65bb6375 100644
--- a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
+++ b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
@@ -11,7 +11,7 @@
 #include "media/filters/h264_to_annex_b_bitstream_converter.h"
 
 // Forward declarations for FFmpeg datatypes used.
-struct AVCodecContext;
+struct AVCodecParameters;
 struct AVPacket;
 
 namespace media {
@@ -21,11 +21,11 @@ namespace media {
 class MEDIA_EXPORT FFmpegH264ToAnnexBBitstreamConverter
     : public FFmpegBitstreamConverter {
  public:
-  // The |stream_codec_context| will be used during conversion and should be the
-  // AVCodecContext for the stream sourcing these packets. A reference to
-  // |stream_codec_context| is retained, so it must outlive this class.
+  // The |stream_codec_parameters| will be used during conversion and should be
+  // the AVCodecParameters for the stream sourcing these packets. A reference to
+  // |stream_codec_parameters| is retained, so it must outlive this class.
   explicit FFmpegH264ToAnnexBBitstreamConverter(
-      AVCodecContext* stream_codec_context);
+      AVCodecParameters* stream_codec_parameters);
 
   ~FFmpegH264ToAnnexBBitstreamConverter() override;
 
@@ -59,7 +59,7 @@ class MEDIA_EXPORT FFmpegH264ToAnnexBBitstreamConverter
 
   // Variable to hold a pointer to memory where we can access the global
   // data from the FFmpeg file format's global headers.
-  AVCodecContext* stream_codec_context_;
+  AVCodecParameters* stream_codec_parameters_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegH264ToAnnexBBitstreamConverter);
 };