webrtc/modules/video_coding/codecs/h264/h264.gypi - Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg

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: webrtc/modules/video_coding/codecs/h264/h264.gypi

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: sync_chromium.py SCRIPT_VERSION bumped ensuring ffmpeg is synced Created 4 years, 12 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: webrtc/modules/video_coding/codecs/h264/h264.gypi

diff --git a/webrtc/modules/video_coding/codecs/h264/h264.gypi b/webrtc/modules/video_coding/codecs/h264/h264.gypi

index a20865c3aaa55ceb414dfa5ce3c7981f6183a146..d48c9ee2121510f1b261ed8e2aa24ba93cb4fbff 100644

--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi

+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi

@@ -23,6 +23,18 @@

'h264_objc.mm',

}],

+ ['use_third_party_h264==1', {

+ 'dependencies': [

+ '<(DEPTH)/third_party/openh264/openh264.gyp:openh264_encoder',

+ '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',

+ ],

+ 'sources': [

+ 'h264_decoder_impl.cc',

+ 'h264_decoder_impl.h',

+ 'h264_encoder_impl.cc',

+ 'h264_encoder_impl.h',

+ ],

+ }],

'sources': [

'h264.cc',