media/filters/ffmpeg_h264_bitstream_converter_unittest.cc - Issue 6541037: Revert 75444 - Move MockFFmpeg instance setting into the constructor/destruct...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/ffmpeg_h264_bitstream_converter_unittest.cc

Issue 6541037: Revert 75444 - Move MockFFmpeg instance setting into the constructor/destruct... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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

Index: media/filters/ffmpeg_h264_bitstream_converter_unittest.cc

===================================================================

--- media/filters/ffmpeg_h264_bitstream_converter_unittest.cc (revision 75447)

+++ media/filters/ffmpeg_h264_bitstream_converter_unittest.cc (working copy)

@@ -270,6 +270,7 @@

FFmpegH264BitstreamConverterTest() {

// Set up the ffmpeg mock and use our local fake functions to do the

// actual implementation for packet allocation / freeing.

+ MockFFmpeg::set(&ffmpeg_mock_);

ON_CALL(ffmpeg_mock_, AVInitPacket(_))

.WillByDefault(Invoke(fake_av_init_packet));

ON_CALL(ffmpeg_mock_, AVNewPacket(_, _))

« no previous file with comments | « media/filters/ffmpeg_glue_unittest.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »