Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: media/filters/ffmpeg_video_decode_engine_unittest.cc

Issue 1289003: Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include. (Closed)
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_video_decode_engine.cc ('k') | third_party/ffmpeg/avcodec-52.sigs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decode_engine_unittest.cc
diff --git a/media/filters/ffmpeg_video_decode_engine_unittest.cc b/media/filters/ffmpeg_video_decode_engine_unittest.cc
index 449a67c259d05554a1b91bf9af9c4c991e655d69..6ce2853357c01ea8ae48c4ec21184f20b793696b 100644
--- a/media/filters/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/filters/ffmpeg_video_decode_engine_unittest.cc
@@ -39,6 +39,10 @@ class FFmpegVideoDecodeEngineTest : public testing::Test {
test_engine_->SetCodecContextForTest(&codec_context_);
}
+ ~FFmpegVideoDecodeEngineTest() {
+ MockFFmpeg::set(NULL);
+ }
+
scoped_ptr<FFmpegVideoDecodeEngine> test_engine_;
StrictMock<MockFFmpeg> mock_ffmpeg_;
« no previous file with comments | « media/filters/ffmpeg_video_decode_engine.cc ('k') | third_party/ffmpeg/avcodec-52.sigs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698