diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 00:39:20 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 00:39:20 +0000 |
| commit | a802823900580c9cb7a137e2fdb1d430a7348a67 (patch) | |
| tree | 7b954d4673f1ec641dbb761c9a4af9aa56b4fdd5 /media/ffmpeg | |
| parent | 6b3a68eb95fc52475f117b49084efce01c0f1d09 (diff) | |
| download | chromium_src-a802823900580c9cb7a137e2fdb1d430a7348a67.zip chromium_src-a802823900580c9cb7a137e2fdb1d430a7348a67.tar.gz chromium_src-a802823900580c9cb7a137e2fdb1d430a7348a67.tar.bz2 | |
Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Patch by sergeyu@chromium.org
BUG=23271
TEST=none
Review URL: http://codereview.chromium.org/1213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 10 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 26 |
2 files changed, 3 insertions, 33 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 5100b31..08228fd 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -6,16 +6,6 @@ namespace media { -FFmpegLock::FFmpegLock() { -} - -FFmpegLock::~FFmpegLock() { -} - -Lock& FFmpegLock::lock() { - return lock_; -} - namespace mime_type { const char kFFmpegAudio[] = "audio/x-ffmpeg"; diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 9be245f..4b60046 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -19,34 +19,14 @@ extern "C" { // Temporarily disable possible loss of data warning. // TODO(scherkus): fix and upstream the compiler warnings. MSVC_PUSH_DISABLE_WARNING(4244); -#include "third_party/ffmpeg/include/libavcodec/avcodec.h" -#include "third_party/ffmpeg/include/libavformat/avformat.h" -#include "third_party/ffmpeg/include/libavutil/log.h" +#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/avcodec.h" +#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avformat.h" +#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/log.h" MSVC_POP_WARNING(); } // extern "C" namespace media { -// FFmpegLock is used to serialize calls to avcodec_open(), avcodec_close(), -// and av_find_stream_info() for an entire process because for whatever reason -// it does Very Bad Things to other FFmpeg instances. -// -// TODO(scherkus): track down and upstream a fix to FFmpeg, if possible. -class FFmpegLock : public Singleton<FFmpegLock> { - public: - Lock& lock(); - - private: - // Only allow Singleton to create and delete FFmpegLock. - friend struct DefaultSingletonTraits<FFmpegLock>; - FFmpegLock(); - virtual ~FFmpegLock(); - - Lock lock_; - DISALLOW_COPY_AND_ASSIGN(FFmpegLock); -}; - - // Wraps FFmpeg's av_free() in a class that can be passed as a template argument // to scoped_ptr_malloc. class ScopedPtrAVFree { |