Cleanup leftover code and suppression from M47 ffmpeg roll.

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/metrics/sparse_histogram.h"
 #include "base/synchronization/lock.h"
@@ skipping 157 matching lines @@
   int numRead = AVIOReadOperation(
       avio_context_.get()->opaque, buffer.get()->data(), buffer.get()->size());
   AVIOSeekOperation(avio_context_.get()->opaque, pos, SEEK_SET);
   if (numRead > 0) {
     // < 0 means Read failed
     container_names::MediaContainerName container =
         container_names::DetermineContainer(buffer.get()->data(), numRead);
     UMA_HISTOGRAM_SPARSE_SLOWLY("Media.DetectedContainer", container);
   }
 
-  // Use TOC when available to quickly seek MP3 file.
-  // TODO(dalecurtis): Remove this upon rolling ffmpeg. Commit c43bd08... will
-  // make setting AVFMT_FLAG_FAST_SEEK (which we already do) default usetoc = 1.
-  AVDictionary* options = nullptr;
-  av_dict_set(&options, "usetoc", "1", 0);
-
   // By passing nullptr for the filename (second parameter) we are telling
   // FFmpeg to use the AVIO context we setup from the AVFormatContext structure.
-  bool success =
-      avformat_open_input(&format_context_, nullptr, nullptr, &options) == 0;
-
-  if (options)
-    av_dict_free(&options);
-
-  return success;
+  return avformat_open_input(&format_context_, nullptr, nullptr, nullptr) == 0;
 }
 
 FFmpegGlue::~FFmpegGlue() {
   // In the event of avformat_open_input() failure, FFmpeg may sometimes free
   // our AVFormatContext behind the scenes, but leave the buffer alive.  It will
   // helpfully set |format_context_| to nullptr in this case.
   if (!format_context_) {
     av_free(avio_context_->buffer);
     return;
   }
@@ skipping 24 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   avformat_close_input(&format_context_);
   av_free(avio_context_->buffer);
 }
 
 }  // namespace media