Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

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: (Alphabetical sorting in common_video.gyp deps) Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
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 78f0be37a7edfedcd5660a207330ff01a367fa29..0e80561bdfddd54ea6165908d7e7816917935a35 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -24,12 +24,19 @@
],
}],
['rtc_use_h264==1', {
- # Dependency for sake of compiling The dependencies will be used for
- # real as soon as https://codereview.webrtc.org/1306813009/ lands.
+ 'defines': [
+ 'WEBRTC_THIRD_PARTY_H264',
+ ],
'dependencies': [
'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'<(DEPTH)/third_party/openh264/openh264.gyp:openh264_encoder',
],
+ 'sources': [
+ 'h264_decoder_impl.cc',
+ 'h264_decoder_impl.h',
+ 'h264_encoder_impl.cc',
+ 'h264_encoder_impl.h',
+ ],
}],
],
'sources': [
« no previous file with comments | « webrtc/modules/video_coding/codecs/h264/h264.cc ('k') | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698