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/ffmpeg | |
| 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/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 1 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 10f67d2..7b73781 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -18,6 +18,7 @@ extern "C" { MSVC_PUSH_DISABLE_WARNING(4244); #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> +#include <libavformat/avio.h> #include <libavutil/avutil.h> #include <libavutil/log.h> MSVC_POP_WARNING(); diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index 0c2f45d..0892d9d 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -401,7 +401,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { avcodec_init(); av_log_set_level(AV_LOG_FATAL); av_register_all(); - av_register_protocol(&kFFmpegFileProtocol); + av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol)); initialized = true; } |