Skip to content

Commit

Permalink
Merge branch 'h264'
Browse files Browse the repository at this point in the history
  • Loading branch information
chebur committed Feb 5, 2015
2 parents 4e6d608 + 84f2162 commit d881768
Show file tree
Hide file tree
Showing 328 changed files with 462 additions and 337 deletions.
74 changes: 42 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,46 @@
.DS_Store
build/*

# openh264
!build/openh264
build/openh264/*

!build/openh264/lib
!build/openh264/lib/*

# pjsip
!build/pj*/
build/pj*/*

!build/pj*/pjlib/
build/pj*/pjlib/*
!build/pj*/pjlib/lib/
!build/pj*/pjlib/include/

!build/pj*/pjlib-util/
build/pj*/pjlib-util/*
!build/pj*/pjlib-util/lib/
!build/pj*/pjlib-util/include/

!build/pj*/pjmedia/
build/pj*/pjmedia/*
!build/pj*/pjmedia/lib/
!build/pj*/pjmedia/include/

!build/pj*/pjnath/
build/pj*/pjnath/*
!build/pj*/pjnath/lib/
!build/pj*/pjnath/include/

!build/pj*/pjsip/
build/pj*/pjsip/*
!build/pj*/pjsip/lib/
!build/pj*/pjsip/include/

!build/pj*/third_party/
build/pj*/third_party/*
!build/pj*/third_party/lib/
!build/pj*/third_party/include/
!build/pjproject
build/pjproject/*

!build/pjproject/src
build/pjproject/src/*

!build/pjproject/src/pjlib/
build/pjproject/src/pjlib/*
!build/pjproject/src/pjlib/lib/
!build/pjproject/src/pjlib/include/

!build/pjproject/src/pjlib-util/
build/pjproject/src/pjlib-util/*
!build/pjproject/src/pjlib-util/lib/
!build/pjproject/src/pjlib-util/include/

!build/pjproject/src/pjmedia/
build/pjproject/src/pjmedia/*
!build/pjproject/src/pjmedia/lib/
!build/pjproject/src/pjmedia/include/

!build/pjproject/src/pjnath/
build/pjproject/src/pjnath/*
!build/pjproject/src/pjnath/lib/
!build/pjproject/src/pjnath/include/

!build/pjproject/src/pjsip/
build/pjproject/src/pjsip/*
!build/pjproject/src/pjsip/lib/
!build/pjproject/src/pjsip/include/

!build/pjproject/src/third_party/
build/pjproject/src/third_party/*
!build/pjproject/src/third_party/lib/
!build/pjproject/src/third_party/include/
312 changes: 35 additions & 277 deletions build.sh

Large diffs are not rendered by default.

Binary file added build/openh264/lib/libopenh264.a
Binary file not shown.
2 changes: 0 additions & 2 deletions build/pjproject-2.3/pjlib/include/pj/config_site.h

This file was deleted.

Binary file not shown.
Binary file not shown.
8 changes: 8 additions & 0 deletions build/pjproject/src/pjlib/include/pj/config_site.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#define PJ_CONFIG_IPHONE 1
#define PJMEDIA_HAS_OPENH264_CODEC 1
#define PJMEDIA_HAS_VIDEO 1
#define PJMEDIA_VIDEO_DEV_HAS_OPENGL 1
#define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 1
#define PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL 1
#include <OpenGLES/ES3/glext.h>
#include <pj/config_site_sample.h>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d881768

Please sign in to comment.