Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1081)

Unified Diff: media/filters/ffmpeg_glue.cc

Issue 1362693002: Cleanup leftover code and suppression from M47 ffmpeg roll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue.cc
diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
index 8aee0bc655257b5f403a04aeca3fe95f49ed1d00..31c6828b445a5a4bfea9c9d3320b7768a471e7bc 100644
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -175,21 +175,9 @@ bool FFmpegGlue::OpenContext() {
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() {
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698