e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
5568026387
'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead
2013-10-14 17:00:28 +01:00
c2b2953f8c
export video-range: add to context menu
2013-10-12 22:56:08 +02:00
f7c54f1435
video-range export tweaks:
...
* quantize range to video-frame boundaries
* warn if range is empty or does not include video
2013-10-12 22:56:08 +02:00
300b484cf6
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
e93c425d6f
'gtk2_ardour' - One further Glib::usleep needed
2013-10-06 10:52:41 +01:00
449f600c69
remove another unnecessary use of libgen.h
2013-10-04 13:02:41 -04:00
4861eca974
Merge branch 'master' into windows
2013-09-13 11:55:56 -04:00
8432f78346
vtl: export selected range
2013-09-12 22:46:11 +02:00
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
25cd52b392
vtl: update to ffmpeg v1.2.1 [lib]x264 option.
2013-09-08 18:27:41 +02:00
8c5cff6091
Merge branch 'master' into windows
2013-09-06 10:56:36 -04:00
a6b66f1594
vtl: fix small issue with video source file on export
2013-09-04 01:36:46 +02:00
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
c4227ca706
fix typos
2013-08-09 19:35:27 +02:00
43ae996b3a
dedicated namespace for video-utils
...
conflicting symbol prophylaxis
2013-08-03 16:54:57 +02:00
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
dd65329363
clean up video related messages
2013-07-23 20:24:23 +02:00
650964f320
Merge branch 'master' into windows
2013-07-17 08:05:59 -04:00
003492cbf9
move ff* structs & typedef into dedicated namespace
...
(further avoid conflicts with plugins)
2013-07-16 18:01:56 +02:00
15be154515
use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files
2013-07-15 14:29:00 -04:00
b407b753f7
vtl: remember original video-file for later export/mux
2013-06-17 09:46:01 +02:00
24af570d06
vtl: update ffmpeg option sameq/qscale
2013-06-16 15:30:15 +02:00
2b90a57655
Fix the spelling and abstract the program name
...
The video exporting dialog has a few spelling bugs, as well
as unabstracted program name. The patch fixes it.
2013-06-14 02:10:31 +02:00
3973ce81b3
remove all of Gtk::Window::set_position (WIN_POS_MOUSE) for anything deriving from ArdourDialog or ArdourWindow; move the set_position() call into those classes' constructors, so that they are called before the windows are realized, and thus it actually works
2013-05-02 18:13:35 -04:00
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02:00
3f97d8c6d5
vtl: remove obvious warning
2013-04-05 00:15:57 +02:00
7fe22a7af3
vtl: overall export progress bar
2013-04-04 23:40:36 +02:00
b4e5eb3c8b
vtl: audio-export progress-bar tweaks
...
use the same concept as session > export > audio;
hopefully this fixes jack-disconnects during export.
2013-04-04 01:05:53 +02:00
7b99abb05d
vtl: renice export dialog
...
* fix scale w/h min+max
* update labels and alignment
2013-04-03 00:59:29 +02:00
1d48fb011e
vtl: update video-export
...
* range: pre/postfix with black video-frames
* fix A/V offset - decode and skip source until offset is reached
* use spinning progress-bar during decode&skip
* use video-stream index in stream-map
* fix audio-export abort; stop freewheeling
* re-indent code
2013-04-02 12:30:19 +02:00
ab3040f789
vtl: ffmpeg interaction:
...
* use ardour/SRC to resample audio on import
* parse framerate via codec-timebase if available
* update encoder parameters
* add vpx/webm as codec option
2013-03-31 19:34:58 +02:00
ba7def458e
messages related to video-server & ffmpeg external binaries
2013-03-27 16:04:56 +01:00
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
