diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:14:02 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:14:02 +0000 |
| commit | 684f665ff630ccae011fb279276b194ef95c631e (patch) | |
| tree | ca609197ac66dcc912a30898df6695b2dd2036d7 /media/test | |
| parent | 27f41125a1978d29304e7582759a2857a0130a21 (diff) | |
| download | chromium_src-684f665ff630ccae011fb279276b194ef95c631e.zip chromium_src-684f665ff630ccae011fb279276b194ef95c631e.tar.gz chromium_src-684f665ff630ccae011fb279276b194ef95c631e.tar.bz2 | |
ffmpeg update with vp3 patches.
switch to av_register_protocol2
video-played-collapse layout test fails and will be fixed later.
BUG=48037
TEST=ffmpeg should still build/run
Review URL: http://codereview.chromium.org/3010016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53281 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 a967bc3..f8da45c 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -115,7 +115,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 |