Ethan Hugg
69cdf61f49
Merge remote-tracking branch 'upstream/master' into cosmetic
2013-12-16 11:46:07 -08:00
Ethan Hugg
bcf102db83
Fixed warnings found by clang. Removed some trailing whitespace.
2013-12-16 11:36:54 -08:00
Ethan Hugg
5d616714c4
Merge pull request #54 from rmuch/freebsd-build
...
Add FreeBSD platform makefile
2013-12-16 09:37:11 -08:00
Ethan Hugg
c97be377b1
Rollup of minor fixes found by Martin Ettl
2013-12-16 09:25:35 -08:00
Andreas Gal
1ca805cd85
Merge pull request #55 from mstorsjo/no-libdl
...
Don't link to libdl when building with NO_DYNAMIC_VP defined
2013-12-16 06:20:38 -08:00
Martin Storsjö
f1cfd1e28a
Don't link to libdl when building with NO_DYNAMIC_VP defined
2013-12-16 09:35:03 +02:00
Rupert Muchembled
51c121f947
Add FreeBSD platform makefile
...
Add platform-freebsd.mk makefile to allow building on FreeBSD.
OpenH264 builds and runs successfully on FreeBSD 9.2-RELEASE amd64, with both
the gcc and clang compilers.
Note that building i386 binaries with the native toolchain using the -m32 flag
on amd64 FreeBSD is unsupported and will not work, so ENABLE64BIT should always
be set to Yes when compiling on a FreeBSD amd64 system.
2013-12-16 07:10:26 +00:00
Ethan Hugg
f427fc63df
Merge pull request #53 from varunbpatil/cleanup
...
Improve handling of help switch in enc test app
2013-12-15 20:24:18 -08:00
Varun B Patil
e65525d7b4
Improve handling of help switch in enc test app
...
welsenc.exe -h is now a valid command which returns success.
No longer prints help text twice in the case when the -h switch
is given along with a wrong cfg.
2013-12-16 09:30:38 +05:30
ekr
e307cbb6a1
Merge pull request #51 from ethanhugg/travis1
...
Add 64bit builds to Travis
2013-12-15 15:10:26 -08:00
Ethan Hugg
4d67423170
Add 64bit builds to Travis
2013-12-15 13:17:49 -08:00
Ethan Hugg
8d3b617761
Merge pull request #48 from licaiguo/master
...
Add 64-bit build support for windows & Linux
2013-12-15 13:01:20 -08:00
Andreas Gal
cb1e34c932
Merge pull request #50 from varunbpatil/cleanup
...
Fix function name type and remove redundant NULL check
2013-12-15 12:17:27 -08:00
Varun B Patil
f5e0058786
Make the two ParseCommandLine functions consistent
...
with respect to strcmp function call.
Removed unnecessary brackets.
2013-12-15 18:49:08 +05:30
Varun B Patil
077c29a0f1
Remove redundant NULL check
...
Address of a pointer variable can never be NULL.
2013-12-15 18:36:15 +05:30
Varun B Patil
42097a6ed3
Fix function name typo in enc test app
2013-12-15 18:34:50 +05:30
licaiguo
077ffed5ea
Add Windows 64-bit build to VS project files
2013-12-15 15:18:19 +08:00
Licai Guo
ac6828f4fa
Enable 64-bit build on Linux & Mac
2013-12-14 20:37:33 -08:00
Ethan Hugg
f2aa3c75ae
Merge pull request #45 from mstorsjo/no-libdl
...
Avoid all calls to libdl (or equivalent) if NO_DYNAMIC_VP is defined
2013-12-14 08:42:09 -08:00
Martin Storsjö
aa78f205d6
Avoid all calls to libdl (or equivalent) if NO_DYNAMIC_VP is defined
...
The same ifdefs are already used in the corresponding constructors,
so this just avoids a runtime/link time library dependency which
is practically unused in this build setup.
2013-12-14 13:17:14 +02:00
adamroach
a8d125f52e
Merge pull request #44 from ethanhugg/travis1
...
Exempt gh-pages from Travis.
2013-12-13 15:41:30 -08:00
Ethan Hugg
47227de12e
Exempt gh-pages from Travis.
2013-12-13 15:33:22 -08:00
Andreas Gal
616dc87feb
Merge pull request #41 from fluffy/cj1
...
Fix compile warnings on OSX compile
2013-12-13 14:55:09 -08:00
adamroach
90327962c3
Merge pull request #43 from ethanhugg/travis1
...
Add make test to Travis
2013-12-13 13:36:56 -08:00
Ethan Hugg
3550319a96
Add make test to Travis
2013-12-13 13:09:59 -08:00
adamroach
26307c1263
Merge pull request #42 from ethanhugg/cosmetic
...
Updated contributors file
2013-12-13 12:55:31 -08:00
Ethan Hugg
8e56711f93
Updated contributors file
2013-12-13 12:52:52 -08:00
Cullen Jennings
41d1c31f7f
Fix warnings on OSX compile
2013-12-13 13:03:38 -07:00
adamroach
e83ba4bdde
Merge pull request #40 from ethanhugg/travis1
...
Added apt-get lines to travis.yml
2013-12-13 11:01:44 -08:00
Ethan Hugg
767260fa3b
Added apt-get lines to travis.yml
2013-12-13 10:00:08 -08:00
adamroach
0360c982cc
Merge pull request #39 from fluffy/travis1
...
Adding Initial config file for Travis
2013-12-13 09:37:55 -08:00
Cullen Jennings
5ee3337dfd
Merge remote-tracking branch 'upstream/master'
2013-12-13 10:10:40 -07:00
Cullen Jennings
ea2826e567
start playing with travis
2013-12-13 09:59:52 -07:00
Ethan Hugg
a913cc853e
Merge pull request #32 from mstorsjo/cosmetics
...
Consistently use unix newlines, remove trailing whitespace
2013-12-13 08:54:14 -08:00
Andreas Gal
90e0057ba6
Merge pull request #36 from mstorsjo/no-mfc-include
...
Don't include the MFC header afxres.h in windows resource files
2013-12-13 07:36:40 -08:00
Andreas Gal
9cf27c36e5
Merge pull request #34 from mstorsjo/make-asm-override
...
Include the platform makefile before adding defines for x86 asm
2013-12-13 07:35:24 -08:00
Andreas Gal
863e7a58ae
Merge pull request #37 from mstorsjo/no-dynamic-close
...
Add a missing NO_DYNAMIC_VP ifdef in the CWelsLib destructor
2013-12-13 07:34:55 -08:00
Martin Storsjö
309d0bbffb
Add a missing NO_DYNAMIC_VP ifdef in the CWelsLib destructor
...
Previously this would try to free a dynamically loaded library
even if none was loaded.
2013-12-13 15:46:45 +02:00
Martin Storsjö
b911920a77
Don't include the MFC header afxres.h in windows resource files
...
Just include windows.h instead. This allows building using the
Express edition versions of MSVC as well, that don't include MFC.
2013-12-13 14:43:25 +02:00
Martin Storsjö
17f9c22a3e
Include the platform makefile before adding defines for x86 asm
...
This fixes building with BUILDTYPE=Release on OS X.
2013-12-13 13:52:00 +02:00
Martin Storsjö
f9dea46712
Remove trailing whitespace
...
Most of it was removed in ff6b669176
2013-12-13 11:24:17 +02:00
Martin Storsjö
8f9a5469be
Convert source files to unix newlines
...
Most files were converted in ff6b669176
2013-12-13 11:20:23 +02:00
ekr
dcf08c6d41
Merge pull request #28 from ethanhugg/master
...
Updated CONTRIBUTORS file
2013-12-12 22:23:34 -08:00
Ethan Hugg
ca83aaeddb
Updated CONTRIBUTORS file
2013-12-12 22:20:41 -08:00
Ethan Hugg
073408be3a
Merge pull request #24 from rmuch/fixes
...
Fix typo in Windows build instructions
2013-12-12 15:35:52 -08:00
Rupert Muchembled
25e3978be8
Fix typo in Windows build instructions
...
Directory for encoder Visual Studio projects should read codec/build/win32/enc.
2013-12-12 23:10:51 +00:00
ekr
924aa42058
Merge pull request #22 from ethanhugg/astyle
...
Added notes in CODING_STYLE
2013-12-12 15:08:57 -08:00
Ethan Hugg
758d064516
Merge pull request #23 from 0x09/master
...
Fix typo in strnlen fallback
2013-12-12 15:08:28 -08:00
tab
3cc719ca0d
Fix typo in strnlen fallback
2013-12-12 17:56:29 -05:00
Ethan Hugg
ab97686e2b
Added notes in CODING_STYLE
2013-12-12 14:54:36 -08:00
