diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 22:52:42 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 22:52:42 +0000 |
| commit | 5a671d2b25a1fcfb64101a09957edc4f802aa489 (patch) | |
| tree | 217b50903305e893e16b8092c799378bc303c7f2 /media/test | |
| parent | a53e0683ad312c10f5772dadbfd5df33c45f03c1 (diff) | |
| download | chromium_src-5a671d2b25a1fcfb64101a09957edc4f802aa489.zip chromium_src-5a671d2b25a1fcfb64101a09957edc4f802aa489.tar.gz chromium_src-5a671d2b25a1fcfb64101a09957edc4f802aa489.tar.bz2 | |
ffmpeg roll for chromium source and windows binaries
Includes fix for XP Perf by reducing webm library size by 1.6 MB
BUG=48037,50507
TEST=XP Perf and layout tests should pass
Review URL: http://codereview.chromium.org/3030024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/test')
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 69bfc80..4e0820d 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -116,7 +116,7 @@ int main(int argc, const char** argv) { 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; // av_open_input_file wants a char*, which can't work with wide paths. // So we assume ASCII on Windows. On other platforms we can pass the |