James Almer
6c31ba2269
avformat/matroska: fix MatroskaVideoFieldOrder enum values
...
The spec says
9: Interlaced with bottom field displayed first and top field stored first
14: Interlaced with top field displayed first and bottom field stored first
And avcodec.h states
AV_FIELD_TB, //< Top coded first, bottom displayed first
AV_FIELD_BT, //< Bottom coded first, top displayed first
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years ago
Vittorio Giovara
41ed7ab45f
cosmetics: Fix spelling mistakes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years ago
Luca Barbato
5f02266681
matroska: Support interlaced content correctly
...
The matroska specification now has two elements for it.
9 years ago
wm4
c4d37cd9ef
matroskadec: export cover art correctly
...
Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.
Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.
Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
Vittorio Giovara
d4ae8ac92f
matroskadec: parse stereo mode on decoding
...
Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.
Bump the doctype version supported.
Bug-Id: 728 / https://bugs.debian.org/757185
10 years ago
Anton Khirnov
eb3b5501e8
matroskadec: read the CodecDelay element
11 years ago
Anton Khirnov
564b7e0c00
matroskadec: silently skip CodecState element.
...
mkvmerge apparrently uses it for mpeg1/2 video, but it contains the same
information as CodecPrivate, so it can be ignored.
12 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
12 years ago
Anton Khirnov
b73ad74660
lavf: move CodecMime from matroska.h to internal.h
...
it will be useful for attached pictures in ID3v2
13 years ago
Alok Ahuja
945dda41a2
webm: support stereo videos in matroska/webm muxer
...
Create a stereo_mode metadata tag to specify the stereo 3d video layout
using the StereoMode tag in a matroska/webm video track.
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
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
15 years ago
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
16 years ago
Aurelien Jacobs
cf960242a4
matroskadec: add needed definitions forgotten in r17331
...
Originally committed as revision 17332 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
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
16 years ago
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
16 years ago
Aurelien Jacobs
44015c56a6
matroskadec: add basic tags support (metadata)
...
Originally committed as revision 14672 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Diego Biurrun
95aad5d1f1
Fix small typo.
...
Originally committed as revision 14628 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Diego Biurrun
5968d2dd1e
misc spelling/grammar fixes
...
Originally committed as revision 14616 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
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
17 years ago
Aurelien Jacobs
4eff97439b
matroskadec: simplify flag default
...
Originally committed as revision 14550 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Aurelien Jacobs
ead3006257
matroskadec: remove storage of various unused flags
...
Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Aurelien Jacobs
d3d265b288
matroska: add support for A_QUICKTIME/QDM2 codec
...
Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Aurelien Jacobs
ded4241bb0
matroskadec: remove some useless code
...
Originally committed as revision 13783 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
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
17 years ago
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
17 years ago
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
17 years ago
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
17 years ago
Diego Biurrun
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
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
17 years ago
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
17 years ago
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
17 years ago
Diego Biurrun
cedb83a671
colour --> color in variable names
...
Originally committed as revision 11159 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
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
17 years ago
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
17 years ago
Diego Biurrun
5b21bdabe4
Add FFMPEG_ prefix to all multiple inclusion guards.
...
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
David Conrad
bd35bdf1b2
Add EBML ID for Segment UID
...
Originally committed as revision 9814 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
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
18 years ago