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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/tools/media_bench/media_bench.cc

Issue 3007022: Merge 54053 - ffmpeg roll for chromium source and windows binaries... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/472/src/
Patch Set: Created 10 years, 5 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 | « media/test/ffmpeg_tests/ffmpeg_tests.cc ('k') | media/tools/omx_test/omx_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/media_bench/media_bench.cc
===================================================================
--- media/tools/media_bench/media_bench.cc (revision 54516)
+++ media/tools/media_bench/media_bench.cc (working copy)
@@ -228,7 +228,7 @@
avcodec_init();
av_log_set_level(verbose_level);
av_register_all();
- av_register_protocol(&kFFmpegFileProtocol);
+ av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
AVFormatContext* format_context = NULL;
int result = av_open_input_file(&format_context, in_path.c_str(),
NULL, 0, NULL);
« no previous file with comments | « media/test/ffmpeg_tests/ffmpeg_tests.cc ('k') | media/tools/omx_test/omx_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698