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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Addressed nits 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
« 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') | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..cb0573da6045cea481211adb28b3220a488fbc98 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -23,6 +23,21 @@
'h264_objc.mm',
],
}],
+ ['use_third_party_h264==1', {
+ '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': [
'h264.cc',
« 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') | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698