diff options
| author | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 02:25:17 +0000 |
|---|---|---|
| committer | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 02:25:17 +0000 |
| commit | 2decb263aecf4eba6e56e76ab191a6a842f2059a (patch) | |
| tree | 52a8fdc40386a4760d70789699813b8078266cff /media/ffmpeg/ffmpeg_unittest.cc | |
| parent | a78313b4762c9c9e0d96261abf009daf7ccb83e5 (diff) | |
| download | chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.zip chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.tar.gz chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.tar.bz2 | |
Glue ffmpeg to Chrome
1) works for Linux, OSX, Windows
2) mostly renaming #defines
3) avcodec_thread_init is deprecated and has been removed, see
http://ffmpeg.org/pipermail/ffmpeg-cvslog/2011-February/034326.html
4) will require a rebaseline of
platform/chromium-mac/media/video-currentTime-set-expected.txt
platform/chromium-win/media/video-currentTime-set-expected.txt
with a change of
-video.currentTime.toFixed(2) == '5.82'
+video.currentTime.toFixed(2) == '5.81'
BUG=87831
TESTS=ran Theora Testsuite, media tests, WebKit media tests
Review URL: http://codereview.chromium.org/6993042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg/ffmpeg_unittest.cc')
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index 86f28bc..9e377aa 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -173,10 +173,10 @@ class FFmpegTest : public testing::TestWithParam<const char*> { << "Could not open AVCodecContext with CodecID " << av_codec_context->codec_id; - if (av_codec->type == CODEC_TYPE_AUDIO) { + if (av_codec->type == AVMEDIA_TYPE_AUDIO) { EXPECT_EQ(-1, audio_stream_index_) << "Found multiple audio streams."; audio_stream_index_ = static_cast<int>(i); - } else if (av_codec->type == CODEC_TYPE_VIDEO) { + } else if (av_codec->type == AVMEDIA_TYPE_VIDEO) { EXPECT_EQ(-1, video_stream_index_) << "Found multiple video streams."; video_stream_index_ = static_cast<int>(i); } else { |