summaryrefslogtreecommitdiffstats
path: root/media/base/media_win.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-27 17:08:58 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-27 17:08:58 +0000
commit4601745d4130886fa65e8a5096c16ee99a19e37b (patch)
tree26f0c8537a4e1bd6b8a600053aaff8ddfd962e52 /media/base/media_win.cc
parentc30664c9350b9885c543b0b3a2d855d2ca842e31 (diff)
downloadchromium_src-4601745d4130886fa65e8a5096c16ee99a19e37b.zip
chromium_src-4601745d4130886fa65e8a5096c16ee99a19e37b.tar.gz
chromium_src-4601745d4130886fa65e8a5096c16ee99a19e37b.tar.bz2
Fix a crash with <video>
Having typo in the file, causing a different dll loaded for <video>. When initializing ffmpeg since avformat-52.dll is not loaded, it tries to do LoadLibrary within sandbox and kaboom! TBR=scherkus Review URL: http://codereview.chromium.org/99024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_win.cc')
-rw-r--r--media/base/media_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/media_win.cc b/media/base/media_win.cc
index aa006a4..31bfe43 100644
--- a/media/base/media_win.cc
+++ b/media/base/media_win.cc
@@ -27,7 +27,7 @@ FilePath::CharType* GetDLLName(FFmpegDLLKeys dll_key) {
case FILE_LIBAVCODEC:
return FILE_PATH_LITERAL("avcodec-52.dll");
case FILE_LIBAVFORMAT:
- return FILE_PATH_LITERAL("avcodec-52.dll");
+ return FILE_PATH_LITERAL("avformat-52.dll");
case FILE_LIBAVUTIL:
return FILE_PATH_LITERAL("avutil-50.dll");
default: