1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

28 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
Reimar Döffinger
c31f00ed63 Fix the MATROSKA_ID_TAGDEFAULT to match the specification (instead of
libmatroska etc. typo) but continue to support the "old" value.

Originally committed as revision 23539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 19:28:22 +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
cf960242a4 matroskadec: add needed definitions forgotten in r17331
Originally committed as revision 17332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 16:00:58 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
Aurelien Jacobs
5df3cc6f80 matroskadec: list some more ebml IDs found in the wild and that we ignore
This avoid printing some warnings about unknow IDs while we in fact know
the IDs but just want to knowingly ignore them.

Originally committed as revision 14738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 21:15:15 +00:00
Aurelien Jacobs
44015c56a6 matroskadec: add basic tags support (metadata)
Originally committed as revision 14672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 23:50:38 +00:00
Diego Biurrun
95aad5d1f1 Fix small typo.
Originally committed as revision 14628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 21:46:10 +00:00
Diego Biurrun
5968d2dd1e misc spelling/grammar fixes
Originally committed as revision 14616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 08:28:57 +00:00
Aurelien Jacobs
cc8be50637 matroska: expand useless define for MS compat codec id strings
Originally committed as revision 14607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:49 +00:00
Aurelien Jacobs
4eff97439b matroskadec: simplify flag default
Originally committed as revision 14550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:53 +00:00
Aurelien Jacobs
ead3006257 matroskadec: remove storage of various unused flags
Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:50 +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
Aurelien Jacobs
ded4241bb0 matroskadec: remove some useless code
Originally committed as revision 13783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 23:11:02 +00:00
Anton Khirnov
7ff9708585 matroskadec: read TrackTimecodeScale and set timebase accordingly
patch by Anton Khirnov   wyskas _at_ gmail _dot_ com

Originally committed as revision 13601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 13:54:11 +00:00
Anton Khirnov
cdae8eec10 matroskadec: silently discard some element ID that we don't care about
patch by Anton Khirnov   wyskas _at_ gmail _dot_ com

Originally committed as revision 13600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 13:39:54 +00:00
Anton Khirnov
f5275b3ce7 demux chapters out of matroska
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 13241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 22:07:09 +00:00
Carl Eugen Hoyos
e3227b3f25 Add MATROSKA_TRACK_TYPE_NONE.
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 15:42:27 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Aurelien Jacobs
53a1e82bd2 matroskadec: add support for track content encoding
Only the header strip method is supported for now.

Originally committed as revision 13082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 21:47:31 +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
Diego Biurrun
cedb83a671 colour --> color in variable names
Originally committed as revision 11159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 13:33:48 +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
Aurelien Jacobs
b96b441ad2 Make Matroska demuxer output full frames instead of slices for RealVideo
Patch by Aurelien Jacobs (aurel at "... is not unix"age.org)
Thread [RFC] Feed whole frames to RV* decoders

Originally committed as revision 10824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-21 17:21:20 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards.
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:37:46 +00:00
David Conrad
bd35bdf1b2 Add EBML ID for Segment UID
Originally committed as revision 9814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-28 06:33:05 +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