Carl Hetherington [Fri, 23 Jan 2015 23:17:36 +0000 (23:17 +0000)]
Hand-apply
111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress reporting when scanning a file for length.
Carl Hetherington [Fri, 23 Jan 2015 23:01:12 +0000 (23:01 +0000)]
Fixed TO_PORT in previous commit.
Carl Hetherington [Fri, 23 Jan 2015 23:00:48 +0000 (23:00 +0000)]
Hand-apply
cb998bee2e70f3426fd95655736deae803efa58e from master; examine a whole FFmpeg file if there is no length information in the header.
Carl Hetherington [Fri, 23 Jan 2015 22:38:36 +0000 (22:38 +0000)]
I don't think that's necessary in 2.x.
Carl Hetherington [Fri, 23 Jan 2015 22:29:16 +0000 (22:29 +0000)]
Fix merge.
Carl Hetherington [Fri, 23 Jan 2015 22:26:24 +0000 (22:26 +0000)]
Remove erroneous rounding of subrip times.
Carl Hetherington [Fri, 23 Jan 2015 21:23:06 +0000 (21:23 +0000)]
Bump version
Carl Hetherington [Fri, 23 Jan 2015 21:23:06 +0000 (21:23 +0000)]
Bump version
Carl Hetherington [Fri, 23 Jan 2015 19:28:42 +0000 (19:28 +0000)]
TO_PORT.
Carl Hetherington [Fri, 23 Jan 2015 19:18:56 +0000 (19:18 +0000)]
Missing windows deps.
Carl Hetherington [Fri, 23 Jan 2015 17:15:18 +0000 (17:15 +0000)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Fri, 23 Jan 2015 17:15:12 +0000 (17:15 +0000)]
TO_PORT.
Carl Hetherington [Thu, 22 Jan 2015 10:39:06 +0000 (10:39 +0000)]
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Thu, 22 Jan 2015 10:38:57 +0000 (10:38 +0000)]
Supporter.
Carl Hetherington [Wed, 21 Jan 2015 19:37:44 +0000 (19:37 +0000)]
Bump version
Carl Hetherington [Wed, 21 Jan 2015 19:37:44 +0000 (19:37 +0000)]
Bump version
Carl Hetherington [Wed, 21 Jan 2015 19:37:16 +0000 (19:37 +0000)]
Fix recognition of MXF-wrapped subtitle content vs audio/video.
Carl Hetherington [Wed, 21 Jan 2015 12:37:08 +0000 (12:37 +0000)]
Bump libsub.
Carl Hetherington [Wed, 21 Jan 2015 12:15:49 +0000 (12:15 +0000)]
Try to fix OS X package.
Carl Hetherington [Wed, 21 Jan 2015 12:15:32 +0000 (12:15 +0000)]
Bump libsub version.
Carl Hetherington [Wed, 21 Jan 2015 10:19:11 +0000 (10:19 +0000)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Wed, 21 Jan 2015 10:18:14 +0000 (10:18 +0000)]
Improve logging slightly.
Carl Hetherington [Tue, 20 Jan 2015 14:51:24 +0000 (14:51 +0000)]
Bump version
Carl Hetherington [Tue, 20 Jan 2015 14:51:24 +0000 (14:51 +0000)]
Bump version
Carl Hetherington [Tue, 20 Jan 2015 14:01:59 +0000 (14:01 +0000)]
Supporter.
Carl Hetherington [Tue, 20 Jan 2015 13:50:49 +0000 (13:50 +0000)]
Seek correctly in AudioDecoder; the frame parameter is in resampled frames, so we must use the same frame rate when converting back to ContentTime for seek.
Carl Hetherington [Tue, 20 Jan 2015 13:49:53 +0000 (13:49 +0000)]
Fix rounding when converting to frames.
Carl Hetherington [Tue, 20 Jan 2015 11:28:11 +0000 (11:28 +0000)]
Bump libsub dependency.
Carl Hetherington [Tue, 20 Jan 2015 11:27:34 +0000 (11:27 +0000)]
More informative error when failing to decode JPEG2000 files.
Carl Hetherington [Tue, 20 Jan 2015 11:27:06 +0000 (11:27 +0000)]
Limit length of error messages in the job manager view.
Carl Hetherington [Tue, 20 Jan 2015 10:33:36 +0000 (10:33 +0000)]
Add some stuff to port.
Carl Hetherington [Mon, 19 Jan 2015 00:26:27 +0000 (00:26 +0000)]
Fix audio analysis; make sure we don't decode video and let it pile up unwanted.
Carl Hetherington [Mon, 19 Jan 2015 00:15:24 +0000 (00:15 +0000)]
VideoDecoder::_same can just be a local.
Carl Hetherington [Mon, 19 Jan 2015 00:10:56 +0000 (00:10 +0000)]
Remove unused variable.
Carl Hetherington [Sat, 17 Jan 2015 02:55:15 +0000 (02:55 +0000)]
Update libsub dep.
Carl Hetherington [Sat, 17 Jan 2015 02:37:14 +0000 (02:37 +0000)]
Bump libsub1 to -does-own-dcp branch.
Carl Hetherington [Sat, 17 Jan 2015 01:49:17 +0000 (01:49 +0000)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Sat, 17 Jan 2015 01:49:10 +0000 (01:49 +0000)]
Update for libsub1 API changes.
Carl Hetherington [Sat, 17 Jan 2015 01:48:53 +0000 (01:48 +0000)]
Remove unused TimedAudioBuffers.
Carl Hetherington [Fri, 16 Jan 2015 16:27:49 +0000 (16:27 +0000)]
Some design notes.
Carl Hetherington [Fri, 16 Jan 2015 09:35:43 +0000 (09:35 +0000)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Fri, 16 Jan 2015 01:09:21 +0000 (01:09 +0000)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Fri, 16 Jan 2015 01:08:38 +0000 (01:08 +0000)]
Some more stuff to port.
Carl Hetherington [Thu, 15 Jan 2015 16:49:22 +0000 (16:49 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 16:49:22 +0000 (16:49 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 12:59:38 +0000 (12:59 +0000)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Thu, 15 Jan 2015 12:59:14 +0000 (12:59 +0000)]
Missing files.
Carl Hetherington [Thu, 15 Jan 2015 11:36:01 +0000 (11:36 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 11:36:01 +0000 (11:36 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 11:23:23 +0000 (11:23 +0000)]
Bump libdcp, libsub.
Carl Hetherington [Thu, 15 Jan 2015 11:22:09 +0000 (11:22 +0000)]
Update tests for subtitle vposition fixes.
Carl Hetherington [Thu, 15 Jan 2015 10:51:49 +0000 (10:51 +0000)]
Remove debug code.
Carl Hetherington [Thu, 15 Jan 2015 10:38:23 +0000 (10:38 +0000)]
Try to fix some OS X warnings.
Carl Hetherington [Thu, 15 Jan 2015 10:27:10 +0000 (10:27 +0000)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Thu, 15 Jan 2015 10:27:03 +0000 (10:27 +0000)]
Try to fix build on OS X.
Carl Hetherington [Thu, 15 Jan 2015 10:11:29 +0000 (10:11 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 10:11:29 +0000 (10:11 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 10:09:56 +0000 (10:09 +0000)]
Bump libsub version.
Carl Hetherington [Thu, 15 Jan 2015 09:41:10 +0000 (09:41 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 09:41:10 +0000 (09:41 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 09:40:52 +0000 (09:40 +0000)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Thu, 15 Jan 2015 09:40:45 +0000 (09:40 +0000)]
Bump libsub version.
Carl Hetherington [Thu, 15 Jan 2015 09:31:37 +0000 (09:31 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 09:31:37 +0000 (09:31 +0000)]
Bump version
Carl Hetherington [Thu, 15 Jan 2015 09:31:02 +0000 (09:31 +0000)]
Bump libdcp version.
Carl Hetherington [Wed, 14 Jan 2015 10:36:27 +0000 (10:36 +0000)]
Supporters.
Carl Hetherington [Wed, 14 Jan 2015 10:31:39 +0000 (10:31 +0000)]
Forward-port DAR/SAR UI stuff from 1.x.
Carl Hetherington [Mon, 12 Jan 2015 11:54:33 +0000 (11:54 +0000)]
Forward-port FTP fix from 1.x.
Carl Hetherington [Mon, 12 Jan 2015 11:36:45 +0000 (11:36 +0000)]
Yet more deps.
Carl Hetherington [Mon, 12 Jan 2015 10:54:27 +0000 (10:54 +0000)]
Another missing dep.
Carl Hetherington [Mon, 12 Jan 2015 10:13:12 +0000 (10:13 +0000)]
More deps.
Carl Hetherington [Mon, 12 Jan 2015 10:00:00 +0000 (10:00 +0000)]
Missing dep.
Carl Hetherington [Mon, 12 Jan 2015 09:57:28 +0000 (09:57 +0000)]
Missing dependency.
Carl Hetherington [Mon, 12 Jan 2015 09:46:24 +0000 (09:46 +0000)]
Remove more nocache params.
Carl Hetherington [Mon, 12 Jan 2015 09:34:51 +0000 (09:34 +0000)]
Remove --nocache from waf call.
Carl Hetherington [Mon, 12 Jan 2015 09:16:22 +0000 (09:16 +0000)]
More build fixes.
Carl Hetherington [Mon, 12 Jan 2015 00:53:33 +0000 (00:53 +0000)]
Fix build.
Carl Hetherington [Mon, 12 Jan 2015 00:40:26 +0000 (00:40 +0000)]
Fix build.
Carl Hetherington [Mon, 12 Jan 2015 00:20:33 +0000 (00:20 +0000)]
Fix build.
Carl Hetherington [Sun, 11 Jan 2015 23:59:53 +0000 (23:59 +0000)]
Try to fix build.
Carl Hetherington [Sun, 11 Jan 2015 22:59:59 +0000 (22:59 +0000)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Sun, 11 Jan 2015 22:59:52 +0000 (22:59 +0000)]
Update waf.
Carl Hetherington [Sun, 11 Jan 2015 22:27:22 +0000 (22:27 +0000)]
Supporter.
Carl Hetherington [Sun, 11 Jan 2015 22:19:18 +0000 (22:19 +0000)]
Bump version
Carl Hetherington [Sun, 11 Jan 2015 22:19:18 +0000 (22:19 +0000)]
Bump version
Carl Hetherington [Sun, 11 Jan 2015 21:46:31 +0000 (21:46 +0000)]
Remove unused variable.
Carl Hetherington [Sun, 11 Jan 2015 21:37:56 +0000 (21:37 +0000)]
Fix make_dmg.sh.
Carl Hetherington [Sun, 11 Jan 2015 20:38:58 +0000 (20:38 +0000)]
Bump version
Carl Hetherington [Sun, 11 Jan 2015 20:38:58 +0000 (20:38 +0000)]
Bump version
Carl Hetherington [Sun, 11 Jan 2015 19:48:59 +0000 (19:48 +0000)]
Comment.
Carl Hetherington [Sun, 11 Jan 2015 18:05:07 +0000 (18:05 +0000)]
Bump libsub dependency.
Carl Hetherington [Sun, 11 Jan 2015 17:19:11 +0000 (17:19 +0000)]
Specific deps for libdcp/libsub.
Carl Hetherington [Sun, 11 Jan 2015 17:18:26 +0000 (17:18 +0000)]
Comment.
Carl Hetherington [Sun, 11 Jan 2015 16:46:12 +0000 (16:46 +0000)]
Fix call to dcp::Time constructor.
Carl Hetherington [Sun, 11 Jan 2015 16:45:23 +0000 (16:45 +0000)]
Remove unused code.
Carl Hetherington [Sun, 11 Jan 2015 03:41:13 +0000 (03:41 +0000)]
To port.
Carl Hetherington [Sun, 11 Jan 2015 02:58:18 +0000 (02:58 +0000)]
Alpha blending fix from 1.x.
Carl Hetherington [Sat, 10 Jan 2015 00:46:17 +0000 (00:46 +0000)]
Update for libdcp changes.
Carl Hetherington [Fri, 9 Jan 2015 21:53:38 +0000 (21:53 +0000)]
Hand-apply
d7329603f8698f5302d11acfc233ca67695e654d from master; timecode labelling.
Carl Hetherington [Fri, 9 Jan 2015 21:41:03 +0000 (21:41 +0000)]
Hand-apply doc tweak from 1.x.
projects / dcpomatic.git / log