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

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: Rebase with master (and remove temporary debug prints) 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:
View side-by-side diff with in-line comments
Download patch
« chromium/.gclient ('K') | « 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 »
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..6e3a27f2ff8fe22ae1f4f9dcb417a3fac168b4cf 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -15,6 +15,18 @@
'target_name': 'webrtc_h264',
'type': 'static_library',
'conditions': [
+ ['use_third_party_h264==1', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/openh264/openh264.gyp:openh264_encoder',
+ '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ ],
+ 'sources': [
+ 'h264_encoder_impl.cc',
+ 'h264_encoder_impl.h',
+ 'h264_decoder_impl.cc',
+ 'h264_decoder_impl.h',
+ ],
+ }],
['OS=="ios"', {
'dependencies': [
'webrtc_h264_video_toolbox',
« chromium/.gclient ('K') | « 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