summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 03:43:22 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 03:43:22 +0000
commita199e400093448023d4f6c555f32d230b3fb2fcd (patch)
treec037a20ac60faeef1c6273aa3b2a6c3050a717da /media/base
parent8edd34f129bfc61b8b5fe85767b30c7a9a32e026 (diff)
downloadchromium_src-a199e400093448023d4f6c555f32d230b3fb2fcd.zip
chromium_src-a199e400093448023d4f6c555f32d230b3fb2fcd.tar.gz
chromium_src-a199e400093448023d4f6c555f32d230b3fb2fcd.tar.bz2
Revert change 16453 because it broke the build.
Review URL: http://codereview.chromium.org/113615 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/media_posix.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 94c1a89..4bddf6d 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -122,11 +122,6 @@ void av_free(void* ptr) {
return av_free_ptr(ptr);
}
-int64_t (*av_rescale_q_ptr)(int64_t a, AVRational bq, AVRational cq) = NULL;
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) {
- return av_rescale_q_ptr(a, bq, cq);
-}
-
} // extern "C"
@@ -245,9 +240,6 @@ bool InitializeMediaLibrary(const FilePath& module_dir) {
av_free_ptr =
reinterpret_cast<void (*)(void*)>(
dlsym(libs[FILE_LIBAVUTIL], "av_free"));
- av_rescale_q_ptr =
- reinterpret_cast<int64_t (*)(int64_t, AVRational, AVRational)>(
- dlsym(libs[FILE_LIBAVUTIL], "av_rescale_q"));
// Check that all the symbols were loaded correctly before returning true.
if (av_get_bits_per_sample_format_ptr &&
@@ -267,8 +259,7 @@ bool InitializeMediaLibrary(const FilePath& module_dir) {
av_register_protocol_ptr &&
av_malloc_ptr &&
- av_free_ptr &&
- av_rescale_q_ptr) {
+ av_free_ptr) {
return true;
}