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

media/filters/ffmpeg_glue.cc

 // Copyright (c) 2012 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.
 
 #include "media/filters/ffmpeg_glue.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 180 matching lines @@
   }
 
   // If avformat_open_input() hasn't been called, we should simply free the
   // AVFormatContext and buffer instead of using avformat_close_input().
   if (!open_called_) {
     avformat_free_context(format_context_);
     av_free(avio_context_->buffer);
     return;
   }
 
-  // If avformat_open_input() has been called with this context, we need to
-  // close out any codecs/streams before closing the context.
-  if (format_context_->streams) {
-    for (int i = format_context_->nb_streams - 1; i >= 0; --i) {
-      AVStream* stream = format_context_->streams[i];
-
-      // The conditions for calling avcodec_close():
-      // 1. AVStream is alive.
-      // 2. AVCodecContext in AVStream is alive.
-      // 3. AVCodec in AVCodecContext is alive.
-      //
-      // Closing a codec context without prior avcodec_open2() will result in
-      // a crash in FFmpeg.
-      if (stream && stream->codec && stream->codec->codec) {
-        stream->discard = AVDISCARD_ALL;
-        avcodec_close(stream->codec);
-      }
-    }
-  }
+  // AVCodecContext closing and freeing needs to be done by users of FFmpegGlue

[DaleCurtis, 2016/11/14 17:58:21]

I'd just delete this, no one looking for this information will look here :)

[wolenetz, 2016/11/15 02:15:35]

Done.

+  // prior to its destruction. Using ScopedPtrAVFreeContext can help with this.
 
   avformat_close_input(&format_context_);
   av_free(avio_context_->buffer);
 }
 
 }  // namespace media