Commit Graph

1766 Commits

Author SHA1 Message Date
Moritz Bunkus
ad8f7970cc Framework for timecode v3 files (with gap support). Patch by Steve Lhomme <s.lhomme@free.fr> 2004-11-29 22:42:15 +00:00
Moritz Bunkus
17feb5c272 Ups.... 2004-11-29 22:40:33 +00:00
Moritz Bunkus
71cfef481f Move the MPEG ES detection further back because it is not very precise and misdetects other stuff (e.g. MP3 frames...). 2004-11-29 22:33:10 +00:00
Moritz Bunkus
be2adf1aba Fix for mkvmerge's new directory structure. Patch by Steve Lhomee <s.lhomme@free.fr> 2004-11-29 22:31:15 +00:00
Moritz Bunkus
6105dd59ce Do not increase the loop variable twice. 2004-11-28 21:15:44 +00:00
Moritz Bunkus
80949fc077 Fixed compilation on Windows ('GetFreeSpace()' is an old Win16 API call). Tried to improve MPEG ES detection. 2004-11-28 21:10:35 +00:00
Moritz Bunkus
4fd7db6727 Merged 2524 from the 1.0 branch. 2004-11-28 18:02:42 +00:00
Moritz Bunkus
274750de27 Merged 2522 from the 1.0 branch. 2004-11-26 17:59:42 +00:00
Moritz Bunkus
fc0d03b31f Merged 2520 from the 1.0 branch. 2004-11-26 17:19:27 +00:00
Moritz Bunkus
8db9d49f5d Handle the aspect ratio embedded in the MPEG-1/-2 stream and convert it to display dimensions unless they've been overridden on the command line. 2004-11-26 16:18:02 +00:00
Moritz Bunkus
109332f251 Merged 2517 from the 1.0 branch. 2004-11-26 13:20:13 +00:00
Moritz Bunkus
0a3dc9a63a Rewind the file after reading the first frame because a different parser object is used. 2004-11-25 21:48:36 +00:00
Moritz Bunkus
3e659ed650 Merged spyder's fixes to the MPEG parser code. Added some of mine, too. Removed debug output from the MPEG ES reader. Put the first sequence header into CodecPrivate. 2004-11-25 19:36:27 +00:00
Moritz Bunkus
be9ec5548f When handling a deferred connection use the proper timecode_adjustment. 2004-11-25 17:50:31 +00:00
Moritz Bunkus
027df6d122 Removed A_AAC again. Only put the AAC track's decoder_config into CodecPrivate if it contains an "unsupported" extension like parametric stereo ("unsupported" = cannot be mapped to one of the existing AAC CodecIDs). 2004-11-24 21:40:01 +00:00
Moritz Bunkus
178a8a1068 Converted the two text subs readers to only processing one entry in each call to read(). 2004-11-24 21:34:30 +00:00
Moritz Bunkus
b9a7ad6637 Support for generating dependency information with gcc 2.95. 2004-11-24 14:16:40 +00:00
Moritz Bunkus
a2214b9266 Fixes for various warnings and thingies so that gcc 2.95 is happy. 2004-11-24 13:38:53 +00:00
Moritz Bunkus
89bf71ac87 Missing initializations and variable declarations for the previous commit. 2004-11-24 13:24:50 +00:00
Moritz Bunkus
577fa40714 Untested code for appending subtitle only files by getting the timecode_adjustment from a file containing video (it's limited, yes, and untested, yes again). 2004-11-23 22:39:35 +00:00
Moritz Bunkus
0128479143 Support for generic AAC that is neither "normal" nor "SBR" (e.g. parametric stereo or other extensions that are not translatable into the various A_AAC/MPEG* CodecIDs). 2004-11-23 13:58:37 +00:00
Moritz Bunkus
1615eb84a4 Merged 2505 from the 1.0 branch. 2004-11-22 20:15:05 +00:00
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