media/base/mock_ffmpeg.h - Issue 909002: Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.

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/base/mock_ffmpeg.h

Issue 909002: Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include. (Closed)

Patch Set: Updated 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:

Index: media/base/mock_ffmpeg.h

diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h

index a4a9f1ad35bfa625cab440c124e244adab6d6500..836e02be9bec5f7df4fc0b42fae60fddf65f526b 100644

--- a/media/base/mock_ffmpeg.h

+++ b/media/base/mock_ffmpeg.h

@@ -21,6 +21,7 @@ class MockFFmpeg {

MOCK_METHOD0(AVCodecInit, void());

MOCK_METHOD1(AVRegisterProtocol, int(URLProtocol* protocol));

MOCK_METHOD0(AVRegisterAll, void());

+ MOCK_METHOD1(AVRegisterLockManager, int(int (*cb)(void**, enum AVLockOp)));

MOCK_METHOD1(AVCodecFindDecoder, AVCodec*(enum CodecID id));

MOCK_METHOD2(AVCodecOpen, int(AVCodecContext* avctx, AVCodec* codec));

« no previous file with comments | « DEPS ('k') | media/base/mock_ffmpeg.cc » ('j') | no next file with comments »