Commit Graph

1894 Commits

Author SHA1 Message Date
Moritz Bunkus
21d4f10d47 New chapter handling due to file concatenation. 2004-11-22 09:54:49 +00:00
Moritz Bunkus
855bc2bd09 Big API change from "char *" to "string". 2004-11-21 22:26:09 +00:00
Moritz Bunkus
292795f4ff Do not try to autodetect whether or not chapters in Ogg/OGM files are UTF-8 but use the system's current locale setting and let the user override it with "--chapter-charset". 2004-11-21 17:33:38 +00:00
Moritz Bunkus
4a48cdb0fc API change from 'char *' to 'string' for 'utf8_init'. Hand over '--chapter-charset' to the reader in case it might need it (*cough* OGM *cough*). 2004-11-21 17:31:37 +00:00
Moritz Bunkus
e9a04ea4a5 Merged 2499 from the 1.0 branch. 2004-11-20 17:11:37 +00:00
Moritz Bunkus
791da21433 Disabled some of the subtitle append code. The subtitle append timecode must be known when connect() is called because that's when the deferred packets are processed. 2004-11-19 14:08:01 +00:00
Moritz Bunkus
a45f8e89b3 Reorganization of some header files. Also use an enum for the file reader status instead of the VERY old EMOREDATA constants (those are even from the Ogg merge sample code I started ogmtools from :)). 2004-11-18 21:21:07 +00:00
Moritz Bunkus
e4c0a53e6f Account for the new Forced flag. 2004-11-18 21:19:36 +00:00
Moritz Bunkus
3e93619199 NULL pointer problem. 2004-11-17 08:54:42 +00:00
Moritz Bunkus
992e5caec1 Made the targets 'mkvmerge', 'mkvinfo', 'mkvextract', 'base64tool' and 'mmg' available. 2004-11-17 08:50:05 +00:00
Moritz Bunkus
ef00fa217e Avoid a warning if FLAC supoprt is disabled. 2004-11-17 08:38:04 +00:00
Moritz Bunkus
afcdfb168d Add the "GUIs" string to the optional feature lists. Made the libebml/libmatroska version checks work. 2004-11-16 15:59:34 +00:00
Moritz Bunkus
8c6a326e9f Documentation update. 2004-11-16 09:53:09 +00:00
Moritz Bunkus
3d92dc63f3 Extract the FPS from MPEG-1 and -2 video if it isn't known (e.g. if it comes from MP4). 2004-11-16 09:04:34 +00:00
Moritz Bunkus
212464d6f9 Support for reading MPEG1 and MPEG2 from MP4 files. 2004-11-15 16:38:15 +00:00
Moritz Bunkus
df7fcc62de The start of support for situations like this: the user appends an AVI to an AVI and VobSubs to VobSubs. In such a case simply using the previous file's max timecode won't work for the subtitle-only files. Therefore mkvmerge has to look for an "associated" file whose max timecode it has to use. This has not been finished yet. 2004-11-15 16:01:13 +00:00
Moritz Bunkus
aae24e6fef That check is wrong. 2004-11-15 15:58:27 +00:00
Moritz Bunkus
1461b515a8 Use the source packetizers' compressor. For some reason creating a new one doesn't work... 2004-11-14 18:26:15 +00:00
Moritz Bunkus
299a18e31d Avoid a couple of warnings. 2004-11-14 12:51:30 +00:00
Moritz Bunkus
291d5fe968 Removal of the old mingw build system. 2004-11-14 12:47:07 +00:00
Moritz Bunkus
fed7ef7dba Unified the build system again. 2004-11-14 12:41:02 +00:00
Moritz Bunkus
55ef898d62 Made the checks for libebml and libmatroska work for cross-compilation, too. Also check if EBML_DLL and MATROSKA_DLL have to be defined. 2004-11-14 12:14:16 +00:00
Moritz Bunkus
0b336e0233 Cross-compilation friendly version of the (u)int64_t checks. 2004-11-14 09:50:15 +00:00
Moritz Bunkus
438086af83 Fixes for the Windows port. 2004-11-14 09:32:22 +00:00
Moritz Bunkus
6c16414ff9 Documentation update. 2004-11-13 20:56:19 +00:00
Moritz Bunkus
de3b877a8c Added a Doxygen file. Ignore the documentation generated by doxygen. 2004-11-13 19:47:48 +00:00
Moritz Bunkus
bbced0c45c Updates for the new timecode adjustment policy for splitting. 2004-11-13 18:59:19 +00:00
Moritz Bunkus
b726dd62ec For subtitle tracks and chapters we have to find the first packet in the new file. This packet's packetizer in the previous file gives us a hint about the timecode adjustment we have to use. 2004-11-13 18:52:15 +00:00
Moritz Bunkus
92eb6cad48 Imlpemented appending chapters. 2004-11-13 17:49:50 +00:00
Moritz Bunkus
03184bb462 Changed the chapter handling to a per-reader basis. This will allow for chapter concatenation when concatenating files. This also means that chapters cannot be written before the output file is closed. Reserving enough space at the beginning is therefore necessary. 2004-11-13 12:59:02 +00:00
Moritz Bunkus
f4b2713eab A bit of clarification. 2004-11-12 19:05:38 +00:00
Moritz Bunkus
c1f2388d4c Avoid an inifinite loop and traverse the amaps correctly. 2004-11-12 15:15:40 +00:00
Moritz Bunkus
be553a4083 Changed the progress display. Now the progress during concatenation can be displayed properly, too. 2004-11-12 15:10:05 +00:00
Moritz Bunkus
8017e13f71 This file is SO outdated that I can't believe it! 2004-11-12 13:36:23 +00:00
Moritz Bunkus
b5a5fcd04a Don't delete objects twice. 2004-11-12 12:07:10 +00:00
Moritz Bunkus
ef188b301f Test result update 2004-11-12 12:04:32 +00:00
Moritz Bunkus
d088d6de07 The OGM reader uses a memory file as temporary storage for the chapters and not a file on disc. 2004-11-12 11:39:32 +00:00
Moritz Bunkus
b9da49770a Made the mm_mem_io_c class optionally grow with the write calls. 2004-11-12 11:36:41 +00:00
Moritz Bunkus
90fa296c0b Merged 2455 from the 1.0 branch with the necessary changes to accomodate for trunk's changed infrastructure. 2004-11-11 16:34:51 +00:00
Moritz Bunkus
cc15da0082 Merged 2453 from the 1.0 branch. 2004-11-11 13:12:52 +00:00
Moritz Bunkus
1900eaa3ba Added spyder to the author list. 2004-11-10 21:55:47 +00:00
Moritz Bunkus
a1fe4d67d9 Merged 2450 2004-11-10 21:54:42 +00:00
Moritz Bunkus
e6becb511d Merged 2448 2004-11-10 21:50:53 +00:00
Moritz Bunkus
31ab4eae04 Added a note about appending files :) 2004-11-10 21:36:48 +00:00
Moritz Bunkus
40c77b3ca4 Do not insist on having a default duration/fps for AVI compat mode video tracks. Video tracks muxed from MP4 don't have that and couldn't be remuxed otherwise. 2004-11-10 21:31:56 +00:00
Moritz Bunkus
f0b422e658 Check for duplicate attachments which can be caused by appending. 2004-11-10 20:51:54 +00:00
Moritz Bunkus
35c2164c95 Increased the minimum libebml version to 0.7.3. 2004-11-10 20:51:27 +00:00
Moritz Bunkus
740a78889b Compilation fixes after the big merge. 2004-11-09 18:49:27 +00:00
Moritz Bunkus
f93d0ab0e7 Merged 2392:2429 from branches/.../mkvtoolnix-cat. 2004-11-09 18:21:59 +00:00
Moritz Bunkus
3dcf05bd69 Merged 2436 2004-11-09 14:06:20 +00:00