diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:32:14 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:32:14 +0000 |
| commit | 859b463585079cc5c4f5b6ae97602988538aeeec (patch) | |
| tree | 2d03dc61a3f77a4aa5a6b5f212c3e8691527dbd9 /media/base/media_posix.cc | |
| parent | 3e1c8fedc6c736caf16ad356d6e99768da49f47c (diff) | |
| download | chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.zip chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.gz chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.bz2 | |
Second attempt to land ffmpeg roll.
Attempt 2 at landing http://codereview.chromium.org/9317096/
Same as before except for fixes in checkperms/
However, fixes have landed elsewhere for:
- mp3 decode issue.
- FrameRateNoVsyncCanvasInternalTest.fishbowl/0
BUG=110776
TEST=unittests, layouttests, trybots, perf tests...
Review URL: https://chromiumcodereview.appspot.com/9447029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_posix.cc')
| -rw-r--r-- | media/base/media_posix.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc index 7be3255..52ad34f 100644 --- a/media/base/media_posix.cc +++ b/media/base/media_posix.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -55,9 +55,9 @@ static std::string GetDSOName(tp_ffmpeg::StubModules stub_key) { // TODO(ajwong): Remove this once mac is migrated. Either that, or have GYP // set a constant that we can switch implementations based off of. switch (stub_key) { - case tp_ffmpeg::kModuleAvcodec53: + case tp_ffmpeg::kModuleAvcodec54: return FILE_PATH_LITERAL(DSO_NAME("avcodec", AVCODEC_VERSION)); - case tp_ffmpeg::kModuleAvformat53: + case tp_ffmpeg::kModuleAvformat54: return FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION)); case tp_ffmpeg::kModuleAvutil51: return FILE_PATH_LITERAL(DSO_NAME("avutil", AVUTIL_VERSION)); |