Andrea3000
8d8c59480e
matroska: fix missing ,
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Allan Kristensen
4789c25d83
matroska: fixed missing S_DVBSUB subtitles
12 years ago
Carl Eugen Hoyos
df39c3ce38
matroskaenc: add codec_tag lists back.
...
This reverts 312645e
:
"Do not set codec_tag property for matroska muxers."
Also adds dummy codec_tag lists with codecs
supported in mkv but not in wav / avi.
Fixes ticket #2169 .
12 years ago
Nicolas George
0942aa4637
lafv/matroska: add A_OPUS/EXPERIMENTAL codec name.
...
The exact packing of Opus inside Matroska is not finalized.
Use A_OPUS/EXPERIMENTAL as codec name, like mkvtoolnix.
The A_OPUS name stays to let ffmpeg open files it has produced
until now, but newly produced file use the EXPERIMENTAL version.
Once the spec is stabilized it will be possible to consider
options to ensure compatibility with these files.
12 years ago
Tom Finegan
66aabd76a9
mkv: support vp9 tag
12 years ago
Diego Biurrun
a0c5917f86
Drop Snow codec
...
Snow is a toy codec with no real-world use and horrible code.
12 years ago
Luca Barbato
117d8c6d1f
matroska: implement support for ProRes
...
Support Matroska native formatting.
On demuxing prepend a Frame container atom (32bit big endian encoded
frame size and 'icpf' string).
On muxing remove it.
12 years ago
Moritz Bunkus
8071dca3d5
matroska: implement support for ALAC
...
Support Matroska native formatting.
On demuxing reconstruct the 36-bytes QuickTime atom that the ALAC
decoder expects by prepending the "atom size", "tag" and
"tag version" fields missing from the Matroska's CodecPrivate
element.
On muxing remove the initial 12 bytes
Sample files are available:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka
and the CoreAudio file it was created from with today's mkvmerge:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Clément Bœsch
ca81e3b6e7
lavf/mkv: prefix video stereo arrays with ff_.
12 years ago
Sébastien Brochet
e14725cecc
add OTF support for attachments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Philip Langdale
2626cc4580
matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.
...
While not explicitly stated in the specs, the original author
has stated that S_TEXT/UTF-8 is expected to be text using Subrip
markup, but without Subrip in-band timing.
So, now that we have a decoder that conforms to this expectation,
let's use it.
Note that this change will impact tools that use libavformat. If
they expect srt subtitles to have CODEC_ID_TEXT, they must be
adjusted to expect CODEC_ID_SUBRIP. The actual content is, obviously,
unchanged.
Signed-off-by: Philip Langdale <philipl@overt.org>
12 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
12 years ago
Moritz Bunkus
bc3b422029
matroskadec: Implement support for ALAC
...
This patch implements support reading ALAC from Matroska files. The
only non-trivial thing about it is that only the ALAC magic cookie is
stored in Matroska's CodecPrivate element but not the "atom size",
"tag" and "tag version" fields that FFMPEG's ALAC decoder
expects. However, those are trivial to re-create.
Sample files are available:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka
and the CoreAudio file it was created from with today's mkvmerge:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Nicolas George
30549294ef
matroska: add support for Opus.
...
Opus in Matroska is still a draft.
13 years ago
Aurelien Jacobs
09525f7956
matroska: improve declaration of video_stereo_* constant tables
14 years ago
Aurelien Jacobs
4c509fe305
matroska: cleanup handling of video stereo mode
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Aurelien Jacobs
2701fd40f9
matroskaenc: add support for muxing SRT tracks
...
Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Google
23966972ab
matroska: Add V_VP8
...
Patch by Google
Originally committed as revision 23192 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
6b10228a55
matroskadec: add support for SIPR audio tracks
...
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
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
15 years ago
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
15 years ago
Aurelien Jacobs
b89894abb7
matroska: add support for MLP and TRUEHD codec tags
...
Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 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
737dccfc1d
matroska: sort codec tags list
...
Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
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
16 years ago
Aurelien Jacobs
23cdcb22a3
matroska: add E-AC-3 support
...
Thanks again Justin !
Originally committed as revision 15146 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
eb9cf50a74
matroska: add support for most variants of PCM
...
Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
20fb02c5b9
matroskadec: remove useless comments in ff_mkv_codec_tags
...
Originally committed as revision 14606 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
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
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
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
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
17 years ago
David Conrad
b75c8d16e7
Add V_SNOW
...
Originally committed as revision 10200 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
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
18 years ago
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
18 years ago
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
18 years ago
Aurelien Jacobs
979c091056
add support for ASS like subtitles in Matroska
...
Originally committed as revision 9593 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Aurelien Jacobs
f7e97aaf87
add support for Matroska subtitle tracks
...
Originally committed as revision 9591 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Aurelien Jacobs
eabb8ba445
add support for real audio in matroska
...
Originally committed as revision 9217 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
Aurelien Jacobs
57004ff1d7
add an enum for need_parsing
...
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Aurelien Jacobs
7fdcdf25a1
cosmetics: indentation
...
Originally committed as revision 8707 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
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
18 years ago
Aurelien Jacobs
79f2634686
add an intermediate variable (prepare for next patch)
...
Originally committed as revision 8697 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Aurelien Jacobs
cca9b6cdb3
add support for seeking in matroska files
...
Originally committed as revision 8696 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
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
18 years ago
Aurelien Jacobs
67545b0ce6
cluster position is relative to segment_start
...
Originally committed as revision 8694 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago