Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull Requestします #1

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e5c6e00
Autotoolize comskip project
Nov 14, 2013
7a782f1
Compile comskip.c with Linux.
Nov 14, 2013
c13034a
Compile mpeg2dec.c with Linux. Modify configure.ac.
Nov 16, 2013
af7e91b
Compile and link comskip with Linux. ( some stub exists.)
Nov 16, 2013
9a05578
Remove stubs.
Nov 16, 2013
c89dfb0
Change configuration of comskip project.
Nov 16, 2013
1f9ac6f
Fix sleep behavior when ffmpeg return code is ERROR.
Nov 16, 2013
9daf10b
Add Japanese AutoConvert comskip.ini.
Nov 16, 2013
19df260
Delete empty ffmpeg directory.
Nov 17, 2013
858733b
Add ffmpeg n1.2.3 under the control of the git.
Nov 17, 2013
71ee9e5
Modify bootstrap and misc file.
Nov 17, 2013
6fd19af
Add comskip_wrapper.sh.
Nov 17, 2013
c675b07
Modify comskip_wrapper.sh. Add CM cut and concat function by ffmpeg.
Nov 17, 2013
746918f
Update ChangeLog.
Nov 17, 2013
709ad35
Delete ffmpeg directory (because Makefile generation is fail. I want …
Nov 19, 2013
3b3e583
Modify bootstrap and ffmpeg git submodule setting.
Nov 19, 2013
7e08bce
Modify bootstrap and Makefile.am
Nov 20, 2013
005acef
Fix Makefile.am, Add 2GB over large file support.
falconws Dec 30, 2013
bfe6767
Merge pull request #1 from falconws/master
Dec 30, 2013
f6203c8
comskip_wrapper.sh: exit 2 if no commercials are found
turenar Jan 14, 2014
130b950
comskip_wrapper.sh: Quote vars
turenar Jan 14, 2014
75de109
comskip_wrapper.sh: centisec support
turenar Jan 15, 2014
08b2b64
Merge pull request #2 from turenar/centisec_support
Jan 15, 2014
4ca5b6c
Delete autogenerated files from git control.
Jan 16, 2014
94c7018
Delete AC_FUNC_MALLOC,AC_CHECK_HEADER from configure.ac. Confirm comp…
Jan 25, 2014
5bac578
fix bug in Hiroyuki-Nagata/comskip's pullreq#2
turenar Feb 24, 2014
89e75ff
Merge pull request #3 from turenar/fix_preq2
Feb 25, 2014
2abbc1b
add cpu arch type
Jun 1, 2014
e80a843
exclude reliance on argtable2, but now LoadSettings is a stub function.
Jun 1, 2014
c9673aa
minor fix for FreeBSD
Jun 1, 2014
a28dbdc
temp
Jun 3, 2014
952167a
fix #1
Jun 3, 2014
2576b94
re-tab
Jun 4, 2014
854d777
fixed a problem that can not be build
Jun 4, 2014
dd84177
Merge pull request #2 from gleentea/issue1
Jun 4, 2014
4dad1cb
remove old LoadSettings function
Jun 4, 2014
ca86fa9
Merge pull request #4 from gleentea/refact
Jul 21, 2014
f151a6d
Update INSTALL/README/configure.ac
Jul 21, 2014
f353c62
fix possible buffer-overrun
turenar Jan 13, 2018
60034fd
Merge pull request #5 from turenar/master
hangingman Feb 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
*.o
*.lo
Makefile
*/Makefile.in
Makefile.in
comskip.app*
comskip.app/*
autom4te*
autom4te*/*
*.libs
*.Plo
*.Po
*.dll
*.dylib
*.a
*.la
*.lai
*.so
*.so.*
*~
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "ffmpeg"]
path = ffmpeg
url = git://source.ffmpeg.org/ffmpeg.git
Empty file added AUTHORS
Empty file.
File renamed without changes.
Loading