third_party/ffmpeg/ffmpeg_stub_headers.fragment - 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: third_party/ffmpeg/ffmpeg_stub_headers.fragment

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: third_party/ffmpeg/ffmpeg_stub_headers.fragment

diff --git a/third_party/ffmpeg/ffmpeg_stub_headers.fragment b/third_party/ffmpeg/ffmpeg_stub_headers.fragment

index 99abcf70e26ed635cc4f2b2d4b6d5d02e155716b..a40cac9361079f326a869eadeab236426ed7c4db 100644

--- a/third_party/ffmpeg/ffmpeg_stub_headers.fragment

+++ b/third_party/ffmpeg/ffmpeg_stub_headers.fragment

@@ -3,7 +3,9 @@

extern "C" {

-#include "third_party/ffmpeg/include/libavcodec/avcodec.h"

-#include "third_party/ffmpeg/include/libavformat/avformat.h"

+#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/avcodec.h"

+#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avformat.h"

+typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);

}

« no previous file with comments | « third_party/ffmpeg/ffmpeg.gyp ('k') | third_party/ffmpeg/include/libavcodec/avcodec.h » ('j') | no next file with comments »