media/filters/bitstream_converter.h - Issue 7587012: Remove mock_ffmpeg and update media unittests.

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/bitstream_converter.h

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: media/filters/bitstream_converter.h

diff --git a/media/filters/bitstream_converter.h b/media/filters/bitstream_converter.h

index a1ca3c615424cd58cd4f8eec5f7f697853941f04..4d66f89f7ed8254c39571ef4051539153579cf0f 100644

--- a/media/filters/bitstream_converter.h

+++ b/media/filters/bitstream_converter.h

@@ -69,11 +69,6 @@ class FFmpegBitstreamConverter : public BitstreamConverter {

virtual bool ConvertPacket(AVPacket* packet);

private:

- FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest, ConvertPacket_FailedFilter);

- FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest, ConvertPacket_Success);

- FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest,

- ConvertPacket_SuccessInPlace);

std::string filter_name_;

AVBitStreamFilterContext* stream_filter_;

AVCodecContext* stream_context_;