Commit Graph

119 Commits

Author SHA1 Message Date
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Aurelien Jacobs
2701fd40f9 matroskaenc: add support for muxing SRT tracks
Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 21:16:58 +00:00
Google
23966972ab matroska: Add V_VP8
Patch by Google

Originally committed as revision 23192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 16:50:06 +00:00
Aurelien Jacobs
6b10228a55 matroskadec: add support for SIPR audio tracks
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 23:49:06 +00:00
Anton Khirnov
ca76a11948 Add a list of generic tags and change demuxers to follow it.
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:39:10 +00:00
Carl Eugen Hoyos
39c6b3f54c Support demuxing Blu-ray subtitles in matroska files.
Patch sent to mailing list by Taylor Ralph, taylor D ralph A gmail

Originally committed as revision 21491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:39:18 +00:00
Aurelien Jacobs
b89894abb7 matroska: add support for MLP and TRUEHD codec tags
Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-30 21:37:04 +00:00
Aurelien Jacobs
719e721a14 Add some basic metadata conversion tables for matroska and asf.
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat.

Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 00:12:08 +00:00
Aurelien Jacobs
737dccfc1d matroska: sort codec tags list
Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 16:04:15 +00:00
Kurtnoise
ea2a5dec33 matroska: add dirac support (patch by Kurtnoise kurtnoise _at_ free _dot_ fr)
Originally committed as revision 16080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 15:55:08 +00:00
Aurelien Jacobs
23cdcb22a3 matroska: add E-AC-3 support
Thanks again Justin !

Originally committed as revision 15146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:50:12 +00:00
Aurelien Jacobs
eb9cf50a74 matroska: add support for most variants of PCM
Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:49:45 +00:00
Aurelien Jacobs
20fb02c5b9 matroskadec: remove useless comments in ff_mkv_codec_tags
Originally committed as revision 14606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:46 +00:00
Aurelien Jacobs
d3d265b288 matroska: add support for A_QUICKTIME/QDM2 codec
Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 15:12:00 +00:00
Evgeniy Stepanov
f8d7c9d373 Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself

Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 15:43:17 +00:00
Aurelien Jacobs
4f632b065b Make ff_mkv_codec_tags lie entirely in .rodata section.
From: Diego 'Flameeyes' Pettenò < flameeyes _at_ gmail _dot_ com >

Originally committed as revision 11440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 00:03:19 +00:00
Evgeniy Stepanov
f9a9b3509c export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)
Originally committed as revision 11352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-29 20:49:03 +00:00
Reimar Döffinger
73a727f369 Make ff_mkv_codec_tags array const, it is never written.
Originally committed as revision 11137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-02 21:52:43 +00:00
David Conrad
c3ce416105 Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv
Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-06 05:14:09 +00:00
David Conrad
b75c8d16e7 Add V_SNOW
Originally committed as revision 10200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-24 00:49:46 +00:00
Aurelien Jacobs
868e43d952 use the most appropriate codec id for A_MPEG/L1 and L2
Originally committed as revision 9794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-25 15:59:26 +00:00
Aurelien Jacobs
0f40b54c17 reorder matroska codec tags so that the encoder picks up the appropriate tag
Originally committed as revision 9793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-25 15:58:12 +00:00
Aurelien Jacobs
ee8c87b55b add support for S_ASS and S_SSA codec string
Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 14:51:43 +00:00
Aurelien Jacobs
979c091056 add support for ASS like subtitles in Matroska
Originally committed as revision 9593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-11 13:37:07 +00:00
Aurelien Jacobs
f7e97aaf87 add support for Matroska subtitle tracks
Originally committed as revision 9591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-11 13:13:20 +00:00
Aurelien Jacobs
eabb8ba445 add support for real audio in matroska
Originally committed as revision 9217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 22:19:17 +00:00
David Conrad
b061d892ed split some common code from the mkv demuxer that will be useful to the muxer
patch by David Conrad  umovimus _at_ gmail.com

Originally committed as revision 9215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 22:10:54 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 13:51:57 +00:00
Aurelien Jacobs
7fdcdf25a1 cosmetics: indentation
Originally committed as revision 8707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-10 11:27:24 +00:00
Aurelien Jacobs
6207bb209e add support for seeking to a keyframe instead of a random frame
Originally committed as revision 8698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 17:03:20 +00:00
Aurelien Jacobs
79f2634686 add an intermediate variable (prepare for next patch)
Originally committed as revision 8697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 17:00:09 +00:00
Aurelien Jacobs
cca9b6cdb3 add support for seeking in matroska files
Originally committed as revision 8696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:48:28 +00:00
Aurelien Jacobs
df06539a25 move matroska_find_track_by_num() upper in the file
so that it can be used by other part of the code

Originally committed as revision 8695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:45:43 +00:00
Aurelien Jacobs
67545b0ce6 cluster position is relative to segment_start
Originally committed as revision 8694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:29:10 +00:00
Aurelien Jacobs
01344104c1 properly set streams start_time
Originally committed as revision 8693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:27:00 +00:00
Aurelien Jacobs
8e7a7e6a01 remove unused context field
Originally committed as revision 8692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:24:03 +00:00
Aurelien Jacobs
794857ae45 remove wrong and no more used packet reordering code
Originally committed as revision 8691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:22:18 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:34:15 +00:00
Aurelien Jacobs
8509fc7b13 add support for V_THEORA into Matroska
Original thread:
Date: Thu, 22 Mar 2007 20:23:08 -0400
Subject: [Ffmpeg-devel] [PATCH] Theora in MKV (GSoC '07 Qualification)

Originally committed as revision 8507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 01:11:00 +00:00
Aurelien Jacobs
262e2bee24 disable pts reordering code and initialize a parser instead
Originally committed as revision 8418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 23:08:58 +00:00
Aurelien Jacobs
5ae4975c65 remove outdated comment
Originally committed as revision 8370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:21:19 +00:00
Aurelien Jacobs
2b1785b7cc remove no more needed parameters
Originally committed as revision 8369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:20:18 +00:00
Aurelien Jacobs
086b0ad8ca set pkt->duration for laced packets too
Originally committed as revision 8366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:16:31 +00:00
Aurelien Jacobs
9b54ab15e7 calculate pts for laced packets
Originally committed as revision 8365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:10:52 +00:00
Aurelien Jacobs
7fde6331a7 calculate default_duration for AAC tracks
Originally committed as revision 8364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:02:55 +00:00
Aurelien Jacobs
25f2b76fdb scale duration and default_duration
Originally committed as revision 8363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:01:24 +00:00
Aurelien Jacobs
916bf03a69 move timecode calculation out of laces loop
Originally committed as revision 8359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 21:58:29 +00:00
Aurelien Jacobs
ded669f836 cosmetic: indent after last commit
Originally committed as revision 8335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 23:44:13 +00:00
Aurelien Jacobs
ac9073c926 reorder pts of packets from tracks using V_MPEG* codecs
Originally committed as revision 8334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 23:40:57 +00:00
Aurelien Jacobs
3d20538d07 revert r7181
This was a stupid mistake. We already take care of time_scale
in av_set_pts_info().

Originally committed as revision 8333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 23:19:27 +00:00