b8044972c4
Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'
...
* commit '117d8c6d1f1c187ffc6098d9618457e00534e013':
matroska: implement support for ProRes
matroska: implement support for ALAC
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20 19:43:38 +02:00
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.
2012-09-19 20:34:14 +02:00
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>
2012-09-19 20:34:14 +02:00
ca81e3b6e7
lavf/mkv: prefix video stereo arrays with ff_.
2012-09-16 02:58:40 +02:00
e14725cecc
add OTF support for attachments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 17:08:18 +02:00
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>
2012-08-25 13:15:41 -07:00
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* 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>
2012-08-07 22:45:46 +02:00
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-07 16:00:24 +02:00
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>
2012-08-05 17:59:12 +02:00
30549294ef
matroska: add support for Opus.
...
Opus in Matroska is still a draft.
2012-07-20 11:19:01 +02:00
09525f7956
matroska: improve declaration of video_stereo_* constant tables
2011-05-24 23:34:24 +02:00
4c509fe305
matroska: cleanup handling of video stereo mode
2011-05-24 01:12:19 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b75c8d16e7
Add V_SNOW
...
Originally committed as revision 10200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-24 00:49:46 +00:00
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
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
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
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
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
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
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
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
7fdcdf25a1
cosmetics: indentation
...
Originally committed as revision 8707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-10 11:27:24 +00:00
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
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
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
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
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
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
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
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
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
Michael Niedermayer
Luca Barbato
Moritz Bunkus
Clément Bœsch
Sébastien Brochet
Philip Langdale
Anton Khirnov
Nicolas George
Aurelien Jacobs
Mans Rullgard
Google
Anton Khirnov
Carl Eugen Hoyos
Kurtnoise
Evgeniy Stepanov
Reimar Döffinger
David Conrad