Download-Tools/ccextractor
1
0
Fork 0
mirror of https://github.com/CCExtractor/ccextractor.git synced 2024-12-25 12:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,422 Commits 4 Branches 26 Tags 272 MiB
c39185abab
Commit Graph

1422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Fernandez
c39185abab Merge branch 'pr/n541_saurabhshri' 2016-12-16 10:03:37 -08:00
Carlos Fernandez
6729c9c33f Merge branch 'pr/n524_DanilaFe' 2016-12-16 10:02:18 -08:00
Carlos Fernandez
4e4a7aa19e Merge branch 'pr/n522_DanilaFe' 2016-12-16 10:01:24 -08:00
Saurabh Shrivastava
8c8a357aa7 Corrected filename. 2016-12-16 11:00:34 +05:30
Saurabh Shrivastava
f2770b4609 Corrected filename. 2016-12-16 10:59:20 +05:30
Danila Fedorin
7c21754b74 Update with upstream changes and fix merge conflict. 2016-12-15 14:05:08 -08:00
Carlos Fernandez
547a9e9fbf Merge branch 'master' of https://github.com/CCExtractor/ccextractor 2016-12-15 13:53:57 -08:00
Carlos Fernandez
fd6a223876 Merge branch 'pr/n520_DanilaFe' 2016-12-15 13:53:37 -08:00
captions
2fd71f00d6 Minor gramatical error 2016-12-15 11:32:17 -08:00
Carlos Fernandez
0301a40560 Merge branch 'pr/n538_Izaron' 2016-12-15 11:31:38 -08:00
Carlos Fernandez
05da03a259 Changed dependency for OCR in release version - use non-debug version of tesseract 2016-12-15 10:24:34 -08:00
Saurabh Shrivastava
6e1763332a Added missing directory for protobuf-c. 
Issue fixed : https://github.com/CCExtractor/ccextractor/issues/536
 2016-12-15 23:00:40 +05:30
Evgeny Shulgin
5bbf27de9c Fixed linux/build script 
Last PR #534
 2016-12-15 21:07:29 +04:00
Danila Fedorin
c6c8de7357 Rename mstotime to millis_to_time in ccx_encoders_ssa. 2016-12-14 17:43:59 -08:00
Danila Fedorin
cbbbb20751 Merge remote-tracking branch 'upstream/master' into cleanup-ccx-common-h 2016-12-14 17:37:55 -08:00
Carlos Fernandez
604f4d8046 Ran dos2unix in all source file, 4 files had CRLF 2016-12-14 19:45:51 +00:00
Carlos Fernandez
579d5e0844 gpacmp4/isom_write.c: Added prototypes for two functions from error.c that aren't included from headers. 2016-12-14 19:11:37 +00:00
Carlos Fernandez
5c3e1d06c0 Merge branch 'pr/n530_Izaron' 2016-12-14 10:18:12 -08:00
Carlos Fernandez
d1663de1d7 Merge branch 'pr/n532_saurabhshri' 2016-12-14 10:17:26 -08:00
Saurabh Shrivastava
1571040eae Printing exact error for clean file. 
Description and discussion here : https://github.com/CCExtractor/ccextractor/pull/529
 2016-12-14 15:45:08 +05:30
Saurabh Shrivastava
8221a26c2d Fixed missing directory in Makefile for linux. 
There was a missing directory /src/protobuf-c in makefile for linux installation.
 2016-12-14 14:20:02 +05:30
Carlos Fernandez
9996836253 Removed LIBCURL in linux build script, since that stuff is not complete 2016-12-14 01:41:38 +00:00
Carlos Fernandez
7aaa1e3edb Corrected timing in Itunes 
Added list of changes to CHANGES.TXT
 2016-12-13 17:39:05 -08:00
Carlos Fernandez
532ecbd449 Fixed Itunes (well, MP4 generally really, maybe more) line repetition. 2016-12-13 13:32:28 -08:00
Carlos Fernandez
e66059f621 Merge branch 'pr/n525_DanilaFe' 2016-12-13 10:44:46 -08:00
Carlos Fernandez
3344040630 Merge branch 'pr/n521_DanilaFe' 2016-12-13 10:43:15 -08:00
Carlos Fernandez
6afe786cad Merge branch 'pr/n519_DanilaFe' 2016-12-13 10:42:29 -08:00
Carlos Fernandez
5f4307932a Merge branch 'pr/n518_DanilaFe' 2016-12-13 10:40:30 -08:00
Carlos Fernandez
4978c3e648 Merge branch 'pr/n517_DanilaFe' 2016-12-13 10:39:56 -08:00
Carlos Fernandez
f0223a2505 Merge branch 'pr/n516_DanilaFe' 2016-12-13 10:38:00 -08:00
Carlos Fernandez
727c407435 Merge branch 'pr/n515_DanilaFe' 2016-12-13 10:32:01 -08:00
Carlos Fernandez
c63a250f2b Merge branch 'pr/n526_Izaron' 2016-12-13 10:31:39 -08:00
Izaron
161b98ef43 Added Vagrantfile 2016-12-13 14:32:35 +03:00
Evgeny Shulgin
2417b74ea5 Fixed CMakeLists for build in cmake (#508) 2016-12-12 12:06:57 -08:00
Carlos Fernandez
620ed70246 Merge branch 'pr/n504_canihavesomecoffee' 2016-12-12 10:11:53 -08:00
Carlos Fernandez
847dc0080a Added 3 more TV show dictionaries. 2016-12-12 10:10:58 -08:00
Evgeny Shulgin
d12600e076 Added the line to check for broken subtitle 
See this line https://github.com/CCExtractor/ccextractor/blob/master/src/lib_ccx/ccx_encoders_transcript.c#L276
 2016-12-12 18:23:21 +04:00
Izaron
7d60f558d5 Fixed -unixts option 2016-12-12 17:18:24 +03:00
Danila Fedorin
5602e420fc Merge remote-tracking branch 'upstream/master' into cleanup-libccx-h 2016-12-11 14:24:55 -08:00
Danila Fedorin
7a25006fa5 Merge remote-tracking branch 'upstream/master' into cleanup-bistream-h 2016-12-11 14:22:31 -08:00
Danila Fedorin
5846093a7f Merge remote-tracking branch 'upstream/master' into refactor-msprint 
# Conflicts:
#	src/lib_ccx/general_loop.c
 2016-12-11 14:20:15 -08:00
Danila Fedorin
88bd1d9c16 Merge remote-tracking branch 'upstream/master' into cleanup-demuxer-h 2016-12-11 14:16:54 -08:00
Danila Fedorin
dc4797bb59 Merge remote-tracking branch 'upstream/master' into cleanup-getmoredata 2016-12-11 14:15:28 -08:00
Danila Fedorin
15b5bddab8 Merge remote-tracking branch 'upstream/master' into cleanup-string-cmp 2016-12-11 14:14:44 -08:00
Danila Fedorin
2b8444b78f Merge remote-tracking branch 'upstream/master' into cleanup-hardsubx 2016-12-11 14:13:49 -08:00
Danila Fedorin
f1d276c988 Merge upstream changes. 2016-12-11 14:13:27 -08:00
Danila Fedorin
b695a8c469 Merge upstream changes 2016-12-11 14:08:37 -08:00
Danila Fedorin
0d0cb83ed6 Merge upstream changes 2016-12-11 14:05:49 -08:00
Victoria Staada
943bb576a9 Added 3 TV series database as requested (#523) 
* Create dict_how_to_get_away_with_murder.txt

* Create dict_stranger_things.txt

* Update dict_stranger_things.txt

* Create dict_sense8.txt
 2016-12-11 11:03:25 -08:00
Danila Fedorin
08e9c3d596 Rename previously not renamed function. 2016-12-11 01:16:52 -08:00