chromium/ffmpeg_stub_headers.fragment - Issue 9325049: Fixup chromium specific bits after merge.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chromium/ffmpeg_stub_headers.fragment

Issue 9325049: Fixup chromium specific bits after merge. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master

Patch Set: Add windows, mac configs, binaries. Created 8 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 unified diff | Download patch

« chromium/config/Chrome/win/ia32/config.h ('K') | « chromium/config/ChromiumOS/linux/x64/libavcodec/codec_names.h ('k') | chromium/scripts/build_ffmpeg.sh » ('j') | chromium/scripts/build_ffmpeg.sh » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // These are some extra includes needed in the generated stub file for defining	1 // These are some extra includes needed in the generated stub file for defining

2 // various FFmpeg types.	2 // various FFmpeg types.

3	3

4 extern "C" {	4 extern "C" {

5	5

6 #include <libavcodec/avcodec.h>	6 #include <libavcodec/avcodec.h>

7 #include <libavcodec/avfft.h>	7 #include <libavcodec/avfft.h>

8 #include <libavformat/avformat.h>	8 #include <libavformat/avformat.h>

	9 #include <libavformat/url.h>

9	10

10 typedef int (AVLockMgrOperation)(void*, enum AVLockOp);	11 typedef int (AVLockMgrOperation)(void*, enum AVLockOp);

11	12

12 }	13 }

OLD	NEW