summaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.c
Commit message (Collapse)AuthorAgeFilesLines
* matroska: fix missing ,Andrea30002013-02-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* matroska: fixed missing S_DVBSUB subtitlesAllan Kristensen2013-02-011-0/+1
|
* matroskaenc: add codec_tag lists back.Carl Eugen Hoyos2013-01-241-0/+3
| | | | | | | | | | 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.
* lafv/matroska: add A_OPUS/EXPERIMENTAL codec name.Nicolas George2013-01-161-0/+1
| | | | | | | | | 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.
* Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'Michael Niedermayer2013-01-151-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f111804eb5c603a344706b84b7164cbf7b4e0df': libvpx: make vp8 and vp9 selectable libvpx: support vp9 nut: support vp9 tag mkv: support vp9 tag rtpdec: Make variables that should wrap unsigned Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: support vp9 tagTom Finegan2013-01-141-0/+1
| |
| * Drop Snow codecDiego Biurrun2013-01-061-1/+0
| | | | | | | | Snow is a toy codec with no real-world use and horrible code.
* | Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'Michael Niedermayer2012-09-201-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '117d8c6d1f1c187ffc6098d9618457e00534e013': matroska: implement support for ProRes matroska: implement support for ALAC Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: implement support for ProResLuca Barbato2012-09-191-0/+1
| | | | | | | | | | | | | | | | Support Matroska native formatting. On demuxing prepend a Frame container atom (32bit big endian encoded frame size and 'icpf' string). On muxing remove it.
| * matroska: implement support for ALACMoritz Bunkus2012-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | lavf/mkv: prefix video stereo arrays with ff_.Clément Bœsch2012-09-161-2/+2
| |
* | add OTF support for attachmentsSébastien Brochet2012-09-101-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.Philip Langdale2012-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-65/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-63/+63
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | matroskadec: Implement support for ALACMoritz Bunkus2012-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | matroska: add support for Opus.Nicolas George2012-07-201-0/+1
| | | | | | | | Opus in Matroska is still a draft.
* | matroska: improve declaration of video_stereo_* constant tablesAurelien Jacobs2011-05-241-2/+2
| |
* | matroska: cleanup handling of video stereo modeAurelien Jacobs2011-05-241-0/+24
|/
* matroskaenc: add support for muxing SRT tracksAurelien Jacobs2010-07-251-0/+1
| | | | Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: Add V_VP8Google2010-05-191-0/+1
| | | | | | Patch by Google Originally committed as revision 23192 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: add support for SIPR audio tracksAurelien Jacobs2010-03-121-1/+1
| | | | Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a list of generic tags and change demuxers to follow it.Anton Khirnov2010-02-011-2/+1
| | | | | | Patch by Anton Khirnov, wyskas at gmail dot com Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support demuxing Blu-ray subtitles in matroska files.Carl Eugen Hoyos2010-01-271-0/+1
| | | | | | 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
* matroska: add support for MLP and TRUEHD codec tagsAurelien Jacobs2009-03-301-0/+2
| | | | Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add some basic metadata conversion tables for matroska and asf.Aurelien Jacobs2009-03-011-0/+7
| | | | | | Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat. Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: sort codec tags listAurelien Jacobs2008-12-121-29/+29
| | | | Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: add dirac support (patch by Kurtnoise kurtnoise _at_ free _dot_ fr)Kurtnoise2008-12-121-0/+1
| | | | Originally committed as revision 16080 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: add E-AC-3 supportAurelien Jacobs2008-09-011-1/+1
| | | | | | Thanks again Justin ! Originally committed as revision 15146 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: add support for most variants of PCMAurelien Jacobs2008-08-201-3/+9
| | | | Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: remove useless comments in ff_mkv_codec_tagsAurelien Jacobs2008-08-051-4/+1
| | | | Originally committed as revision 14606 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: add support for A_QUICKTIME/QDM2 codecAurelien Jacobs2008-07-271-0/+1
| | | | Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for Matroska attachments.Evgeniy Stepanov2008-01-271-0/+12
| | | | | | patch by eugeni _dot_ stepanov _at_ gmail.com and myself Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_mkv_codec_tags lie entirely in .rodata section.Aurelien Jacobs2008-01-071-1/+1
| | | | | | From: Diego 'Flameeyes' Pettenò < flameeyes _at_ gmail _dot_ com > Originally committed as revision 11440 to svn://svn.ffmpeg.org/ffmpeg/trunk
* export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)Evgeniy Stepanov2007-12-291-4/+4
| | | | Originally committed as revision 11352 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_mkv_codec_tags array const, it is never written.Reimar Döffinger2007-12-021-1/+1
| | | | Originally committed as revision 11137 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkvDavid Conrad2007-09-061-1/+1
| | | | Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add V_SNOWDavid Conrad2007-08-241-0/+1
| | | | Originally committed as revision 10200 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use the most appropriate codec id for A_MPEG/L1 and L2Aurelien Jacobs2007-07-251-2/+2
| | | | Originally committed as revision 9794 to svn://svn.ffmpeg.org/ffmpeg/trunk
* reorder matroska codec tags so that the encoder picks up the appropriate tagAurelien Jacobs2007-07-251-3/+3
| | | | Originally committed as revision 9793 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add support for S_ASS and S_SSA codec stringAurelien Jacobs2007-07-161-0/+2
| | | | Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add support for ASS like subtitles in MatroskaAurelien Jacobs2007-07-111-0/+2
| | | | Originally committed as revision 9593 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add support for Matroska subtitle tracksAurelien Jacobs2007-07-111-0/+5
| | | | Originally committed as revision 9591 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add support for real audio in matroskaAurelien Jacobs2007-06-041-0/+5
| | | | Originally committed as revision 9217 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split some common code from the mkv demuxer that will be useful to the muxerDavid Conrad2007-06-041-2789/+3
| | | | | | patch by David Conrad umovimus _at_ gmail.com Originally committed as revision 9215 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add an enum for need_parsingAurelien Jacobs2007-04-151-1/+1
| | | | Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: indentationAurelien Jacobs2007-04-101-1/+1
| | | | Originally committed as revision 8707 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add support for seeking to a keyframe instead of a random frameAurelien Jacobs2007-04-091-0/+13
| | | | Originally committed as revision 8698 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add an intermediate variable (prepare for next patch)Aurelien Jacobs2007-04-091-1/+3
| | | | Originally committed as revision 8697 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud