Commit Graph

13123 Commits

Author SHA1 Message Date
Moritz Bunkus
13e3716c24 #ifdef to make mkvmerge.cpp compile under Windows from Shelly. 2003-04-11 15:28:45 +00:00
Moritz Bunkus
2c36690431 Simplified the gcc version check. 2003-04-11 15:18:17 +00:00
Moritz Bunkus
7dd85dd92d Automatic ChangeLog update. 2003-04-11 13:45:35 +00:00
Moritz Bunkus
e155b0e970 standard GPL 2003-04-11 13:44:04 +00:00
Moritz Bunkus
dfb99df0c6 Newer info with updated installation instructions which reflect that libebml is now separated from libmatroska. 2003-04-11 13:42:27 +00:00
Moritz Bunkus
34a7f66c51 Initial release - copied from ogmmerge.1 ;) 2003-04-11 13:03:56 +00:00
Moritz Bunkus
d48411215e Fixed indentation. 2003-04-11 12:50:19 +00:00
Moritz Bunkus
5f68cc75d2 Automatic ChangeLog update. 2003-04-11 12:31:46 +00:00
Moritz Bunkus
d7d15a2fbd New style process support. 2003-04-11 11:54:36 +00:00
Moritz Bunkus
2da0ea0b82 Stream selection based on the serial number, not the stream number. Removed deprecated parameters from various packetizers. Renamed "stream" to "track" where appropriate. Unified and simplified demuxing and handling of the different stream types. 2003-04-11 11:52:57 +00:00
Moritz Bunkus
8c6b5c450a Removed deprecated parameters from MP3 packetizers. 2003-04-11 11:37:41 +00:00
Moritz Bunkus
c67512c107 Renamed "stream" to "track". Removed the bitrate argument from the AC3 packetizer. Introduced frame type flags (I, P). New style process support. Unified audio reading and processing (PCM, MP3, AC3). 2003-04-11 11:36:18 +00:00
Moritz Bunkus
543f902b0f Removed the bitrate from the AC3 packetizer arguments. 2003-04-11 11:30:18 +00:00
Moritz Bunkus
e9032be686 New style "process" function support. 2003-04-11 11:29:28 +00:00
Moritz Bunkus
c07d6382c3 New style "process" function support. Lacing now reports two packets laced, the third one is stored implicitly. 2003-04-11 11:29:01 +00:00
Moritz Bunkus
033953b41c New style "process" function support. New frame type flags (I, P, B) introduced. 2003-04-11 11:27:32 +00:00
Moritz Bunkus
8f3bbc4a9d New style "process" function support. New frame type flags (I, P, B) introduced, although only I and P frames are handled at the moment. 2003-04-11 11:27:14 +00:00
Moritz Bunkus
f1c4c9e81c New style "process" function support. 2003-04-11 11:23:54 +00:00
Moritz Bunkus
3befef6db3 New style "process" function support. Some explicit char* typecasts. 2003-04-11 11:23:40 +00:00
Moritz Bunkus
57c0cbb01d Renamed "stream" to "track". 2003-04-11 11:19:49 +00:00
Moritz Bunkus
8edd337bb0 Renamed "stream" to "track". process can either use the supplied timecode or calculate the timecode itself. 2003-04-11 11:19:30 +00:00
Moritz Bunkus
4d7ed9c509 Renamed 'stream' to 'track'. Removed the useless 'set_parameters' function. 2003-04-11 10:36:55 +00:00
Moritz Bunkus
e7f6448fda Renamed 'stream' to 'track'. Removed the useless function 'set_parameters'. process now either uses the supplied timecode or calculates it on its own if timecode == -1. 2003-04-11 10:32:31 +00:00
Moritz Bunkus
f6b7ba5dd9 Very, very early support for Matroska files. General looping is implemented, the packetizers are created, but the data is not being read and processed. Just a commit to make the whole thing compile. 2003-04-11 10:19:39 +00:00
Moritz Bunkus
bcf00e0ce7 Renamed all variables with "streams" to "*tracks" as "track" is the correct Matroska term. 2003-04-11 10:05:11 +00:00
Moritz Bunkus
a5d8d82e84 Very, very early support for Matroska files. General looping is implemented, the packetizers are created, but the data is not being read and processed. Just a commit to make the whole thing compile. 2003-04-11 10:03:16 +00:00
Moritz Bunkus
0732bc8b9e New parameters --with-ebml-* that reflect the separation of libebml from libmatroska. 2003-04-11 09:56:47 +00:00
Moritz Bunkus
efa790ab5e Makefile for mkvmerge for Microsoft Developer Studio by Shelly 2003-04-09 13:34:31 +00:00
Moritz Bunkus
af2d81dafd #include fixes for compilation under Win32. Preliminary support for KaxBlockAdditional. 2003-04-09 13:30:23 +00:00
Moritz Bunkus
d0d532a7c4 Makefile for Microsoft Developer Studio by Shelly 2003-04-09 13:27:33 +00:00
Moritz Bunkus
0dc382c4e3 Fixes for compilation under Win32 by Shelly. 2003-04-09 13:25:13 +00:00
Moritz Bunkus
2f38653689 Disabled Matroska reader support because it still only exists in my checked out copy. 2003-03-23 20:27:53 +00:00
Moritz Bunkus
8118542b6e Moved the support functions get_uint16 and get_uint32 to common.cpp. 2003-03-13 09:31:36 +00:00
Moritz Bunkus
e494e808ad Added a TYPE for Matroska sources. Moved the support functions get_uint16 and get_uint32 to common.cpp. 2003-03-13 09:31:06 +00:00
Moritz Bunkus
4e7dc88cc4 Necessary fixes to make mkvinfo.cpp compile with gcc 3.2 2003-03-13 09:28:23 +00:00
Moritz Bunkus
45ce1784af Track numbers start with 0, not 1. Added "Matroska" to the list of supported file formats. Re-enabled "uncompressed PCM" and "text subs" as supported output types for --list-types. Added support for a Matroska reader. 2003-03-13 09:27:36 +00:00
Moritz Bunkus
25698bfc01 Removed two tasks that I have already done or at least a preliminary working version for. 2003-03-13 09:25:56 +00:00
Moritz Bunkus
f87ad8e065 Fixes that make avilib compile on cygwin by Shailesh L Mistry <shailesh.mistry@milan.eclipse.co.uk> 2003-03-11 13:01:18 +00:00
Moritz Bunkus
74f92a5d68 Explicit type conversions in order to satisfy gcc 3.2 2003-03-10 22:10:14 +00:00
Moritz Bunkus
72e15986c5 Added support for SRT reading. Added support for outputting the preliminary simple text subtitle format. 2003-03-06 23:39:40 +00:00
Moritz Bunkus
841b50e3ac Renamed the variables track_video and track_audio to simply video/audio as track_video and track_audio are already used as track type enumerations by libmatroska. 2003-03-06 23:38:37 +00:00
Moritz Bunkus
955f6262d2 Moved fourcc into track_info_t. Remapped some error messages from Fatal to Error - Fatal should be reserved for stuff that will definitely stop mkvmerge afterwards. 2003-03-05 17:44:32 +00:00
Moritz Bunkus
6b1feb6015 Put all track relevant variables into a struct that is passed down from mkvmerge to the readers and from them to the packetizers. 2003-03-05 13:51:20 +00:00
Moritz Bunkus
c3d5a69152 First version based on ogmtool's README. 2003-03-04 19:09:59 +00:00
Moritz Bunkus
ac91f588b6 Automatic ChangeLog update. 2003-03-04 10:24:58 +00:00
Moritz Bunkus
7adc572de8 Removed some items I've implemented. 2003-03-04 10:19:12 +00:00
Moritz Bunkus
935bdab7f8 Automatic ChangeLog update. 2003-03-04 10:17:36 +00:00
Moritz Bunkus
a6488d0cb0 Changed all pointers to general data to unsigned char * 2003-03-04 10:16:28 +00:00
Moritz Bunkus
dae92d4fef Added audio sync handling for Vorbis streams. 2003-03-04 10:15:33 +00:00
Moritz Bunkus
6f0cba6a2f Removed range processing. This is a left-over from the days when there was no ogmsplit. 2003-03-04 09:27:05 +00:00