diff options
| author | pph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 18:52:04 +0000 |
|---|---|---|
| committer | pph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 18:52:04 +0000 |
| commit | 928ca1d2c1f13f57b02b62576b0814b3337bedbd (patch) | |
| tree | 9f8e385d3ccb5b0b45d6eff8392793dcf40a2225 /media/video | |
| parent | eeddc3ce39740f97156e42830d4865099c6b2eb9 (diff) | |
| download | chromium_src-928ca1d2c1f13f57b02b62576b0814b3337bedbd.zip chromium_src-928ca1d2c1f13f57b02b62576b0814b3337bedbd.tar.gz chromium_src-928ca1d2c1f13f57b02b62576b0814b3337bedbd.tar.bz2 | |
gcc 4.6 warnings cleanup
BUG=87490
TEST=compile with gcc 4.6
Review URL: http://codereview.chromium.org/8050008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine_unittest.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc index 4b46ee7..2ab4b3f 100644 --- a/media/video/ffmpeg_video_decode_engine_unittest.cc +++ b/media/video/ffmpeg_video_decode_engine_unittest.cc @@ -175,10 +175,6 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_OpenDecoderFails) { TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) { Initialize(); - // We rely on FFmpeg for timestamp and duration reporting. - const base::TimeDelta kTimestamp = base::TimeDelta::FromMicroseconds(0); - const base::TimeDelta kDuration = base::TimeDelta::FromMicroseconds(10000); - // Simulate decoding a single frame. scoped_refptr<VideoFrame> video_frame; DecodeASingleFrame(i_frame_buffer_, &video_frame); @@ -187,8 +183,7 @@ TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) { // the buffer timestamp. ASSERT_TRUE(video_frame); EXPECT_EQ(0, video_frame->GetTimestamp().ToInternalValue()); - EXPECT_EQ(kDuration.ToInternalValue(), - video_frame->GetDuration().ToInternalValue()); + EXPECT_EQ(10000, video_frame->GetDuration().ToInternalValue()); } |