Ethan Hugg
b6dcd94cb0
Merge pull request #180 from mstorsjo/remove-disabled-bundle-loading
...
Remove disabled/broken/unused code for bundle loading in the console tools
2014-01-21 10:30:28 -08:00
Ethan Hugg
57a292b106
Merge pull request #179 from mstorsjo/fix-bundleloader-64bit
...
Fix building of macos bundle loading code on 64 bit
2014-01-21 09:46:40 -08:00
Ethan Hugg
c4609af29c
Merge pull request #178 from mstorsjo/remove-system-header-hackery
...
Remove system header/define hackery in welsenc.cpp
2014-01-21 09:45:38 -08:00
Ethan Hugg
47db901f29
Merge pull request #177 from mstorsjo/remove-unused-function
...
Remove an unused function
2014-01-21 09:44:08 -08:00
Ethan Hugg
6d880360b0
Merge pull request #175 from mstorsjo/remove-unused-define
...
Remove the __NO_CTYPE define
2014-01-21 09:39:49 -08:00
Martin Storsjö
867d39e01b
Remove system header/define hackery in welsenc.cpp
...
There doesn't seem to be any actual need for this, building
on linux still works just fine.
2014-01-21 15:02:51 +02:00
Martin Storsjö
67405177d9
Remove an unused function
...
This function contains a lot of platform specific constants
whose use is unknown.
2014-01-21 15:01:52 +02:00
Martin Storsjö
d1a6929516
Fix building of macos bundle loading code on 64 bit
2014-01-21 15:00:56 +02:00
Martin Storsjö
35ad8cb3a5
Remove an exclude of an nonexistent file
2014-01-21 14:59:41 +02:00
Martin Storsjö
41928236e4
Remove unused files about macos bundle loading from the console tools
2014-01-21 14:59:41 +02:00
Martin Storsjö
b903aa8273
Remove/disable broken code for loading the encoder library from a macos bundle
...
This refers to a file "bundlewelsenc.h" which doesn't even
exist in the project at the moment.
The corresponding bundle loading code is not called at all
in the decoder console tool.
2014-01-21 14:59:41 +02:00
Martin Storsjö
5cb3fc93e0
Remove the __NO_CTYPE define
...
Nothing within the project uses it, and it's not necessary to
build the project either, tested on both linux and mingw.
2014-01-21 12:48:33 +02:00
volvet
f8b84b642d
Merge pull request #173 from mstorsjo/readme-rc-issue
...
Mention the issues about the rate control if frame skipping is disabled
2014-01-21 00:36:47 -08:00
Martin Storsjö
1f688a8731
Mention the issues about the rate control if frame skipping is disabled
...
As requested by Volvet in the review of the frame skipping option.
2014-01-21 10:20:29 +02:00
Ethan Hugg
ae027b83d8
Merge pull request #159 from mstorsjo/frameskip-option
...
Add a runtime option for controlling frame skipping
2014-01-20 16:56:32 -08:00
Ethan Hugg
a8f16f3bb1
Merge pull request #170 from varunbpatil/unused_headers
...
Removed unused headers in test/
2014-01-20 11:11:21 -08:00
Ethan Hugg
a22313acc8
Merge pull request #169 from varunbpatil/mktargets_sh
...
Don't execute mktargets.py if cannot cd into correct directory
2014-01-20 10:59:31 -08:00
Varun B Patil
d1d444b622
Removed unused headers in test/
2014-01-20 22:11:47 +05:30
Varun B Patil
2d83e4561a
Don't execute mktargets.py if cannot cd into correct directory
2014-01-20 21:52:36 +05:30
Ethan Hugg
7d6035d5d4
Merge pull request #164 from varunbpatil/mktargets_cleanup
...
Cleanup mktargets.py
2014-01-19 09:14:52 -08:00
Ethan Hugg
a8a2c36fbd
Merge pull request #163 from varunbpatil/makefile_cleanup
...
Cleanup include dir list in Makefile
2014-01-19 09:14:11 -08:00
Varun B Patil
d78906aa21
Cleanup mktargets.py
...
1.Remove semicolons
2.close file
2014-01-19 21:39:20 +05:30
Varun B Patil
32b3b72e9f
Cleanup include dir list in Makefile
2014-01-19 20:30:31 +05:30
Ethan Hugg
a50d54f8e8
Merge pull request #162 from Vproject/yasm
...
Allow yasm to be used instead of nasm.
2014-01-18 08:55:49 -08:00
V
a6463be0cc
Allow yasm to be used instead of nasm.
...
http://www.nasm.us/doc/nasmdoc3.html#section-3.4.1 says a zero should
follow $ in numeric constants, but yasm complains about it when not
followed.
2014-01-18 13:59:24 +01:00
ekr
bbe51935c7
Merge pull request #160 from ethanhugg/windows_readme
...
Update ReadMe for new Windows builds
2014-01-17 14:16:25 -08:00
ekr
8892e99fbc
Merge pull request #161 from ethanhugg/msvc_flags
...
Update msvc options from VS projects.
2014-01-17 14:16:17 -08:00
Ethan Hugg
2011a7407e
Merge pull request #147 from volvet/illegal_assembly_fix
...
fix illegal instruction use
2014-01-17 14:13:24 -08:00
Ethan Hugg
00e9293433
Update msvc options from VS projects.
2014-01-17 12:56:15 -08:00
Ethan Hugg
0da712380b
Merge pull request #155 from mstorsjo/update-gtest-makefile
...
Regenerate gtest-targets.mk using mktargets.sh/py
2014-01-17 12:14:22 -08:00
Ethan Hugg
5ed47afc82
Update ReadMe for new Windows builds
2014-01-17 11:47:38 -08:00
Martin Storsjö
b38976944a
Regenerate gtest-targets.mk using mktargets.sh/py
...
This simplifies updating all makefiles consistently.
2014-01-17 18:53:17 +02:00
Martin Storsjö
a8d549e343
Omit assembler source rules if no asm sources are found
2014-01-17 18:52:46 +02:00
Ethan Hugg
16099cfd32
Merge pull request #154 from mstorsjo/no-recursive-make
...
Don't call make recursively to build codec_unittest
2014-01-17 08:49:56 -08:00
Ethan Hugg
dc2d799d2b
Merge pull request #150 from mstorsjo/msvc-make
...
Support building with MSVC via the makefiles by doing "make UNAME=msvc"
2014-01-17 08:49:00 -08:00
Ethan Hugg
0c438ecdd3
Merge pull request #158 from mstorsjo/fix-msvc-2012-build
...
Fix building in MSVC 2012 by avoiding redefining the inline keyword
2014-01-17 08:45:44 -08:00
Martin Storsjö
cee3329ff0
Add a runtime option for controlling frame skipping
2014-01-17 12:39:33 +02:00
Martin Storsjö
6e75136201
Don't load welsdec.dll at runtime in the decConsole test app on windows
...
Instead just link directly to it. This matches how the library is
linked/loaded in encConsole/h264enc as well.
Only the 2008 version project file is updated for now, since
the 2010 and 2012 ones are out of sync right now.
2014-01-17 12:06:21 +02:00
Martin Storsjö
7f6cdb516d
Add platform files for msvc and msvc-arm
...
Build with "make UNAME=msvc" to invoke this.
2014-01-17 12:06:12 +02:00
Martin Storsjö
46e6bb5c67
Allow overriding the cflags for debug/optimization and for 32/64 bit
2014-01-17 12:06:12 +02:00
Martin Storsjö
09585cf65a
Allow overriding the command syntax for linking libraries
2014-01-17 12:06:11 +02:00
Martin Storsjö
b842ff30e5
Make the compiler/ar/linker file output parameters overrideable
...
This is in preparation for allowing building using MSVC via
makefiles.
2014-01-17 12:06:11 +02:00
Martin Storsjö
d7c907198b
Fix building in MSVC 2012 by avoiding redefining the inline keyword
...
While building succeeds in MSVC 2008, it currently fails in 2012
due to error C1189 "The C++ standard library forbids macroizing
keywords", which is caused by doing "#define inline __inline" in
the macros.h header.
This could have been missed before since it only was triggered
if macros.h was included before some other system header was
included that contained checks against these inline defines.
2014-01-17 12:04:27 +02:00
Martin Storsjö
c0fcb8f90f
Don't call make recursively to build codec_unittest
2014-01-17 11:05:33 +02:00
Ethan Hugg
306a1daa14
Merge pull request #149 from varunbpatil/typo
...
fix typo
2014-01-16 11:43:47 -08:00
Varun B Patil
98ff18d15d
fix typo
2014-01-17 00:50:03 +05:30
Ethan Hugg
e68f435a84
Merge pull request #148 from varunbpatil/makefile_simplify
...
simplify gtest makefile
2014-01-16 10:35:31 -08:00
Varun B Patil
a00b0ca79b
simplify gtest makefile
2014-01-16 23:33:20 +05:30
volvet
856f186b8e
fix illegal instruction use
2014-01-16 15:57:22 +08:00
Ethan Hugg
b1fc94e314
Merge pull request #134 from mstorsjo/encode-sps-pps
...
Add an encoder method for encoding the SPS/PPS without encoding a frame
2014-01-14 15:31:18 -08:00