Commit Graph

549 Commits

Author SHA1 Message Date
Moritz Bunkus
cbb245d66f Get the default_track flag from Matroska files added to mmg. 2005-02-19 16:26:01 +00:00
Moritz Bunkus
c7ae617c17 Added a warning right before muxing starts if the chapter editor is not empty but no chapter file has been selected. Did some cleanup, too. 2005-02-19 15:42:31 +00:00
Moritz Bunkus
bd20dccdc3 Added an option to configure for disabling the use of posix_fadvise completely. Also check the OS and kernel version. Use posix_fadvise only if we're running on Linux and a kernel from the 2.6.x series or newer. 2005-02-17 18:36:15 +00:00
Moritz Bunkus
dd3abddd7b Moved the reversal of content encodings from the Matroska reader into a new class called "content_decoder_c". Moved a lot of track entry accessibility functions from xtr_base.cpp into commonebml.cpp. Implemented VobSub extraction based on Mike Matsnev's code. This should make all those suckers happy! (Don't feel offended ;)) 2005-02-11 20:38:00 +00:00
Moritz Bunkus
cb77d9eff4 ChangeLog update. Less duplicate code. 2005-02-08 21:43:38 +00:00
Moritz Bunkus
b9ec81a4ce Added the 1.0.2 release message. 2005-02-06 20:52:40 +00:00
Moritz Bunkus
51bcc0e993 Added a couple of entries for the commits during the past month. 2005-02-06 19:37:18 +00:00
Moritz Bunkus
af3eee55e5 Use posix_fadvise if it is present. With newer libc and kernel 2.6.x this results in a speed up for the whole muxing process. Patch by Peter Niemayer (niemayer () isg ! de) with modifications by myself. 2005-02-02 09:16:52 +00:00
Moritz Bunkus
c687069807 Added couple of checks for invalid or empty chapter language entries. 2005-01-30 19:19:03 +00:00
Moritz Bunkus
c10d088868 Proper use of MODE_WRITE (which should open a file for appending) and MODE_CREATE (which should truncate existing files). Fixes the "chapter files might contain garbage at the end if an older file was overwritten with a smaller one" problem. 2005-01-30 18:28:07 +00:00
Moritz Bunkus
923308ff45 Changed the tooltip for the "stretch" input box. Only append "/1" to the "stretch" argument if the user hasn't entered a fraction himself. 2005-01-20 11:18:41 +00:00
Moritz Bunkus
8592bbf459 Added files for making the mkvmerge-gui.html file into a HTML help book. Added code for showing that help file when the user presses F1 or selects "Help" from the "Help" menu. Updates for the build process which generates the .hhk index file from the .hhc contents file. 2005-01-08 15:26:12 +00:00
Moritz Bunkus
61bf6edc3e Updates 2005-01-07 19:13:59 +00:00
Moritz Bunkus
170338893e Implemented appending tracks in mmg. 2005-01-02 19:05:50 +00:00
Moritz Bunkus
4c3045326b Updates 2004-12-31 14:22:41 +00:00
Moritz Bunkus
dfc5132ac9 Weee! 2004-12-28 22:41:08 +00:00
Moritz Bunkus
ddaf26635e Support for "silent tracks" elements. Added project file for mkvinfo for MSVC. Patch by Steve Lhomme <steve ! lhomme () free ! fr> 2004-12-28 18:50:54 +00:00
Moritz Bunkus
844c32ec67 Added WAVPACK4 extraction. Patch by Steve Lhomme (see AUTHORS). Fixes for compiling mkvextract with MS VisualC++. Patch by Steve Lhomme as well. 2004-12-27 17:17:16 +00:00
Moritz Bunkus
81613055c3 Small ChangeLog update. 2004-12-27 17:04:25 +00:00
Moritz Bunkus
8505f6e401 Added WAVPACK4 muxing. Patch by Steve Lhomme (see AUTHORS). 2004-12-18 17:10:54 +00:00
Moritz Bunkus
9ec376abc4 Merged 2589 from the 1.0 branch. 2004-12-18 16:29:20 +00:00
Moritz Bunkus
504232b7a3 Merged 2576:2577 from the 1.0 branch. 2004-12-15 18:38:54 +00:00
Moritz Bunkus
01a716f3f5 Merged 2575 from the 1.0 branch. 2004-12-15 18:23:46 +00:00
Moritz Bunkus
5d01bda627 Merged 2559:2561 from the 1.0 branch. 2004-12-11 17:13:34 +00:00
Moritz Bunkus
9697bce053 Merged 2545:2547 from the 1.0 branch. 2004-12-09 12:38:09 +00:00
Moritz Bunkus
274750de27 Merged 2522 from the 1.0 branch. 2004-11-26 17:59:42 +00:00
Moritz Bunkus
1615eb84a4 Merged 2505 from the 1.0 branch. 2004-11-22 20:15:05 +00:00
Moritz Bunkus
e9a04ea4a5 Merged 2499 from the 1.0 branch. 2004-11-20 17:11:37 +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
986d1b6470 Merged 2414 2004-11-05 15:17:52 +00:00
Moritz Bunkus
1ee83112f4 Merged 2411 2004-11-04 22:24:19 +00:00
Moritz Bunkus
ce7a756a41 Merged 2385 2004-10-24 18:15:29 +00:00
Moritz Bunkus
f5a51f891f Merged 2370 2004-10-17 08:43:23 +00:00
Moritz Bunkus
84a99509bd Merged 2362 2004-10-16 18:31:13 +00:00
Moritz Bunkus
cbd9c7bf01 Always regenerate Vorbis timecodes. This is necessary because Vorbis is laced, and when reading it from Matroska the timestamps might come out wrong if the output has different lacing, e.g. when splitting is active. 2004-10-16 13:46:34 +00:00
Moritz Bunkus
14c21e6ae8 Defer the initialization of the XML mapping tables and link the entries to the libmatroska classes with their DebugName. This gets rid of the problems with different compilers/optimization settings causing the EbmlIds to be initialized too late. 2004-10-11 11:19:33 +00:00
Moritz Bunkus
d7375f9c4b Merged 2344 2004-10-10 11:15:31 +00:00
Moritz Bunkus
ade3c7b68b Merged 2342 2004-10-10 08:51:10 +00:00
Moritz Bunkus
6897f8825f Merged 2335 2004-10-09 17:31:17 +00:00
Moritz Bunkus
d5ca84ac0d Moved the external timecode stuff into their own classes. Enabled proper durations for tracks with external timecodes. 2004-10-09 14:28:58 +00:00
Moritz Bunkus
0b5a723a5f Merged 2327 2004-10-08 20:07:38 +00:00
Moritz Bunkus
7f2da5eb94 Merged 2324 2004-10-08 19:51:49 +00:00
Moritz Bunkus
079a666f0a Merged 2315 2004-10-07 21:02:10 +00:00
Moritz Bunkus
915d0b067c Merged 2313 2004-10-07 19:20:54 +00:00
Moritz Bunkus
0cf20e1d3c Merged 2309 2004-10-07 18:08:26 +00:00
Moritz Bunkus
87ce579c97 Merged 2291 2004-10-05 21:43:41 +00:00
Moritz Bunkus
469b69f5c0 Added a new warning if there is no corresponding track in a source file for a track UID used on the command line. 2004-10-04 19:18:25 +00:00
Moritz Bunkus
ad223a1369 Merged 2262 2004-10-03 09:49:18 +00:00
Moritz Bunkus
81a82d9477 Merged 2260 2004-10-03 09:34:32 +00:00
Moritz Bunkus
ac2ecf55df Added a vector to hold the indices over INDEX 01. Previously matroska didn't allow for more than INDEX 00 and INDEX 01 for a track, now it allows for [INDEX 00 - INDEX 99], inclusive, bringing it in compliance with the Red Book specification for audio CDs. Patch by Vegard Pettersen <vegard_p at broadpark adot no>. 2004-09-30 18:34:27 +00:00
Moritz Bunkus
d29a4552fa Merged 2233 2004-09-28 18:25:43 +00:00
Moritz Bunkus
b9c47da897 Merged 2229 2004-09-28 12:58:51 +00:00
Moritz Bunkus
370070224a Merged 2217 2004-09-27 15:29:33 +00:00
Moritz Bunkus
2535f0754d Merged 2213 2004-09-27 09:53:42 +00:00
Moritz Bunkus
b08c723bc8 Merged 2211 2004-09-26 13:36:33 +00:00
Moritz Bunkus
2c754d52e8 Merged 2193:2195 2004-09-24 10:02:19 +00:00
Moritz Bunkus
958b73fdf5 Merged 2190 2004-09-21 12:41:42 +00:00
Moritz Bunkus
213bf82b26 Merged 2182 2004-09-17 20:29:12 +00:00
Moritz Bunkus
92727d3e1c Merged 2180 2004-09-17 17:41:56 +00:00
Moritz Bunkus
ba33221a0e Merged 2174 2004-09-16 13:55:47 +00:00
Moritz Bunkus
d24e562ec8 Merged 2172 2004-09-15 22:28:28 +00:00
Moritz Bunkus
6b7a173a64 Added a quick Matroska file parser that uses the seek head entries for locating specific level 1 elements. Changed the mkvextract modules to use this parser. 2004-09-07 21:32:37 +00:00
Moritz Bunkus
9b76d0a29b Store cluster timecodes in 64bit variables. They may get that big for small timecode scale factors. 2004-09-02 19:32:07 +00:00
Moritz Bunkus
ac54a6cd30 Skip empty clusters without thinking it's the end of the file. 2004-09-02 18:35:36 +00:00
Moritz Bunkus
abdffccbf4 Support for MP2 and mabybe MP3 in MP4. 2004-08-30 22:20:53 +00:00
Moritz Bunkus
194e6e1205 Merged 2109 2004-08-29 21:29:31 +00:00
Moritz Bunkus
b8f7f687ca Merged 2087 2004-08-28 16:03:39 +00:00
Moritz Bunkus
d81b3d4bc7 Merged 2085 2004-08-28 15:03:12 +00:00
Moritz Bunkus
c861cfc5fb Merged 2040 2004-08-28 14:29:15 +00:00
Moritz Bunkus
06872f2bda Merged 2033 2004-08-22 18:20:02 +00:00
Moritz Bunkus
b7fb69f2f3 Merged 2029:2031 2004-08-22 17:51:55 +00:00
Moritz Bunkus
05afdc7448 Merged 2025:2028 2004-08-22 14:28:12 +00:00
Moritz Bunkus
d0127d04bd Merged 2022 2004-08-21 18:13:29 +00:00
Moritz Bunkus
969915fff6 Merged 2019 2004-08-21 15:46:41 +00:00
Moritz Bunkus
7f656b5108 Merged 2002:2004 2004-08-21 09:42:38 +00:00
Moritz Bunkus
c3310655f5 Merged 2001 2004-08-20 16:56:32 +00:00
Moritz Bunkus
d995e8fad2 Merged 1999 2004-08-19 20:16:58 +00:00
Moritz Bunkus
9ad679db3b Merged 1995 2004-08-19 19:36:40 +00:00
Moritz Bunkus
181645a758 Merged 1983:1986. 2004-08-16 21:29:50 +00:00
Moritz Bunkus
428402f807 Merged 1979. 2004-08-14 12:28:25 +00:00
Moritz Bunkus
f35b2477dd Merged 1973:1975. 2004-08-13 14:20:17 +00:00
Moritz Bunkus
edfd116406 Merged 1967. 2004-08-06 11:40:58 +00:00
Moritz Bunkus
f1cb30f576 Merged 1965. 2004-08-05 20:04:24 +00:00
Moritz Bunkus
9961f8a682 Merged 1963. 2004-08-04 21:04:26 +00:00
Moritz Bunkus
46d4aadb45 Use the new EditionUID entries for the "CUE sheet to chapters/tags" conversion. 2004-08-02 18:12:10 +00:00
Moritz Bunkus
c418c7f6a0 Put the version nick name into each version message. 2004-08-01 17:52:52 +00:00
Moritz Bunkus
038dc2ef68 mkvextract must write an UTF-8 BOM if it outputs text in UTF-8. 2004-08-01 16:11:12 +00:00
Moritz Bunkus
ad0ef8330e Skip ID3 tags in TTA files. 2004-07-31 23:37:59 +00:00
Moritz Bunkus
ef05689ade Do not free stacked memory. 2004-07-31 22:09:48 +00:00
Moritz Bunkus
b6a35b029a The block_duration is now in ns, so divide by 1000000 where appropriate. 2004-07-27 11:42:45 +00:00
Moritz Bunkus
0a86296b26 Limited support for extracting CUE sheets from chapters not created with mkvmerge's "--chapters" option. 2004-07-26 20:39:25 +00:00
Moritz Bunkus
fcb2005d93 Write a block duration of 0s in cases where it's appropriate, e.g. for subtitle entries. 2004-07-26 18:38:56 +00:00
Moritz Bunkus
eb8e212b7a Extract the duration of each FLAC packet from the packet header. Set the default duration on FLAC tracks if they have a fixed number of samples per packet (which is the case for at least the reference implementation according to their documentation). 2004-07-26 18:17:16 +00:00
Moritz Bunkus
71d153f81d Advance the buffer position if an ID3 tag is found. Otherwise the function would be stuck in an endless loop. 2004-07-26 10:57:11 +00:00
Moritz Bunkus
08a7900316 Bumped the version number to 0.9.4. 2004-07-25 10:04:57 +00:00
Moritz Bunkus
43b72a9f0c Added support for extracting TTA tracks into TTA files. 2004-07-23 22:59:28 +00:00
Moritz Bunkus
1ff5ffa311 Strip spaces before integer parsing. 2004-07-23 22:22:28 +00:00
Moritz Bunkus
812c23798f Implemented the extraction of chapter information and tags into CUE sheets which reconstructs the CUE sheet used with mkvmerge's "--chapters" parameter. 2004-07-21 19:31:40 +00:00
Moritz Bunkus
ede68e964c Sort VobSub entries according to their timestamp if there are tracks with timestamps that go backwards. Also warn about such entries. 2004-07-20 17:22:18 +00:00
Moritz Bunkus
fcbe6b82b0 Use proper indexes for the set_as_default_track function and NOT the indexes from libmatroska for track_*. 2004-07-19 20:01:20 +00:00
Moritz Bunkus
c0c49885f7 Handle empty text fields in SSA lines gracefully. 2004-07-19 19:41:06 +00:00
Moritz Bunkus
b8b87e7ec5 Added support for the "hidden" and "enabled" flags in the chapter editor. 2004-07-19 19:19:03 +00:00
Moritz Bunkus
7bbaf75e34 Convert the pregap from CUE sheets into sub-chapters. 2004-07-19 17:18:46 +00:00
Moritz Bunkus
40c83275b7 Compilation fix with MATROSKA_VERSION >= 2. 2004-07-19 16:52:05 +00:00
Moritz Bunkus
007664f55f Updates 2004-07-19 08:43:25 +00:00
Moritz Bunkus
21f801e720 Parse timestamps in CUE sheets correctly as HH:MM:FF (hours, minutes, frames) instead of HH:MM:SS. 2004-07-18 21:14:14 +00:00
Moritz Bunkus
12f346f6e2 Bumped version number to 0.9.3. 2004-07-18 16:21:00 +00:00
Moritz Bunkus
3db592b512 The "default track" checkbox must not check for selected_file anymore. This was changed during the "global track order" thingy. 2004-07-18 16:19:16 +00:00
Moritz Bunkus
47de897341 Do not add a block group more than once to the cues (happened with --cues ...:all). 2004-07-14 11:37:49 +00:00
Moritz Bunkus
bc10e8e2aa Add "vprp" to the list of known but unsupported tags. Otherwise "lasttag" will be reset and avilib does not "see" the additional OpenDML RIFF chunks. 2004-07-13 16:22:00 +00:00
Moritz Bunkus
7265088ddf Added a new --default-language option. Changed the default language code from "eng" to "und" (undefined). 2004-07-10 16:40:51 +00:00
Moritz Bunkus
27c5169e60 Automatically convert tags found in CUE sheets that are used as chapter files. 2004-07-07 18:51:19 +00:00
Moritz Bunkus
3768bc3738 Set default track flags correctly. 2004-07-03 08:49:00 +00:00
Moritz Bunkus
c8d86da5a3 Added support for TTA lossless audio files. 2004-07-02 23:01:05 +00:00
Moritz Bunkus
580fcb6594 Updated the mmg guide. 2004-06-29 20:59:20 +00:00
Moritz Bunkus
a66d3fe755 Bumped the version to 0.9.2. 2004-06-28 19:08:36 +00:00
Moritz Bunkus
5929b23052 Added "minimize" buttons to the two "mkvmerge is running" dialogs. 2004-06-25 13:07:13 +00:00
Moritz Bunkus
53779c6e8c Added the "use File -> new after adding a job" option 2004-06-25 12:46:02 +00:00
Moritz Bunkus
27294dbf4d Update 2004-06-24 14:13:02 +00:00
Moritz Bunkus
b6aaf4c104 Catch all of mkvmerge's output. 2004-06-21 17:46:13 +00:00
Moritz Bunkus
ea3afb72c3 Support for the change of --track-order to global meaning. 2004-06-20 17:42:41 +00:00
Moritz Bunkus
9c40995588 Line wrap the tooltips on Windows. 2004-06-20 09:17:19 +00:00
Moritz Bunkus
152695e258 Suggest a job name based on the output file name. 2004-06-20 08:46:00 +00:00
Moritz Bunkus
a0f34b90af Temporarily disable "always on top" when the muxing or job dialog are visible. 2004-06-20 08:34:34 +00:00
Moritz Bunkus
369e2b92b9 Let the user enter the split time with ms precision. 2004-06-20 00:02:51 +00:00
Moritz Bunkus
43fc361b9f Updates 2004-06-19 21:24:46 +00:00
Moritz Bunkus
118c65053d Search for five consecutive valid MP3 frames at the start of the MP3 file/stream. 2004-06-15 21:28:24 +00:00
Moritz Bunkus
3bb368ee8a Apply "always on top" during mmg startup. 2004-06-13 20:52:10 +00:00
Moritz Bunkus
71fc1797d9 Return proper error codes in xio.cpp. 2004-06-13 15:29:21 +00:00
Moritz Bunkus
dfff949b36 Forgot the release entry. 2004-06-13 11:25:40 +00:00
Moritz Bunkus
e50f42e869 Note about dropping aviclasses. 2004-06-13 10:52:35 +00:00
Moritz Bunkus
0c1220c18a Bumped version number to 0.9.1. 2004-06-13 10:48:02 +00:00
Moritz Bunkus
392e93cdbc Handle charset conversion correctly. 2004-06-13 10:15:29 +00:00
Moritz Bunkus
cbdd217586 Delete the job file itself along with the job data. 2004-06-13 10:08:28 +00:00
Moritz Bunkus
34568cd17e Clarification 2004-06-12 17:32:14 +00:00
Moritz Bunkus
06bf5e3c16 Added an "always on top" option. 2004-06-12 17:22:14 +00:00
Moritz Bunkus
1a46dc1d7e Moved the MPEG4 pixel aspect extraction function to a new helper file. The AVI reader will report the display dimensions if they are different than the pixel dimensions with --identify-verbose (only if the video track is MPEG4 and contains the pixel aspect ratio in the bitstream). 2004-06-12 15:43:56 +00:00
Moritz Bunkus
870ac2a4a3 MP3 garbage detection has to use the proper offsets for MP3 header decoding. 2004-06-12 08:34:22 +00:00
Moritz Bunkus
28d202b31e Calculate the timecodes for frames in laces correctly if either the BlockDuration or DefaultDuration is present. 2004-06-08 19:57:54 +00:00
Moritz Bunkus
b7d6462430 Removed support for time slices. 2004-06-06 12:04:26 +00:00
Moritz Bunkus
73d092d6be Added a dialog for adding arbitrary command line options. 2004-06-06 11:32:07 +00:00
Moritz Bunkus
9403ab3134 Wrong test for OGM header packets. 2004-06-04 19:29:19 +00:00
Moritz Bunkus
e4c4dc68e2 Enable garbage audio sync for tracks read from AVI files. 2004-06-03 21:20:02 +00:00
Moritz Bunkus
f9f4bf5a50 Bumped version number to 0.9.0. 2004-05-31 21:30:47 +00:00
Moritz Bunkus
ce0c8a6986 Detect and handle the absence of comment packets in non-native streams (aka "AVI compatibility mode streams"). 2004-05-31 18:37:40 +00:00
Moritz Bunkus
44e92511fc Try to skip the first MP3 header found in the stream if the second one is not located directly behind the first one. Happens for MP3 streams in AVIs. 2004-05-29 15:20:06 +00:00
Moritz Bunkus
203abdad51 Always set the defalt_chapter_language. Otherwise newly created chapters might get no language associated with the name. Also: Select the proper tab for the chapter editor after the removal of the "advanced" tab. 2004-05-25 17:19:57 +00:00
Moritz Bunkus
a84492c95e Removed the "advanced" tab. 2004-05-25 16:22:32 +00:00
Moritz Bunkus
804ac7b02a Create the BITMAPINFOHEADER in an Endian safe way. 2004-05-25 12:52:18 +00:00