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

media/filters/audio_file_reader.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_AUDIO_FILE_READER_H_
 #define MEDIA_FILTERS_AUDIO_FILE_READER_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "media/base/audio_codecs.h"
 #include "media/base/media_export.h"
+#include "media/ffmpeg/ffmpeg_deleters.h"
 #include "media/filters/ffmpeg_glue.h"
 
 struct AVCodecContext;
 struct AVPacket;
 struct AVStream;
 
 namespace base { class TimeDelta; }
 
 namespace media {
 
@@ skipping 45 matching lines @@
   // Returns true if a packet could be demuxed from the first audio stream in
   // the file, |output_packet| will contain the demuxed packet then.
   bool ReadPacketForTesting(AVPacket* output_packet);
 
   // Seeks to the given point and returns true if successful.  |seek_time| will
   // be converted to the stream's time base automatically.
   bool SeekForTesting(base::TimeDelta seek_time);
 
   const AVStream* GetAVStreamForTesting() const;
   const AVCodecContext* codec_context_for_testing() const {
-    return codec_context_;
+    return codec_context_.get();
   }
 
  private:
   bool OpenDemuxer();
   bool OpenDecoder();
   bool ReadPacket(AVPacket* output_packet);
 
+  // Destruct |glue_| after |codec_context_|.
   std::unique_ptr<FFmpegGlue> glue_;
-  AVCodecContext* codec_context_;
+  std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
+
   int stream_index_;
   FFmpegURLProtocol* protocol_;
   AudioCodec audio_codec_;
   int channels_;
   int sample_rate_;
 
   // AVSampleFormat initially requested; not Chrome's SampleFormat.
   int av_sample_format_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioFileReader);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_FILE_READER_H_