summaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.h
Commit message (Collapse)AuthorAgeFilesLines
* Adding AlphaMode element to Matroska ParserVignesh Venkatasubramanian2013-02-141-0/+1
| | | | | | | | | Adding support for parsing AlphaMode element in the Track header and export that information as a metadata tag. This flag indicates presence of alpha channel data in BlockAdditional element. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Adding support for parsing BlockAdditionalVignesh Venkatasubramanian2013-02-141-0/+4
| | | | | | | | | | | Matroska specification lists support for BlockAdditional element which is not supported by ffmpeg's matroska parser. This patch adds grammar definitions for parsing that element (and few other related elements) and then puts the data in AVPacket.side_data with new AVPacketSideDataType AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/mkv: prefix video stereo arrays with ff_.Clément Bœsch2012-09-161-2/+2
|
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-011-5/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move CodecMime from matroska.h to internal.hAnton Khirnov2012-02-291-5/+1
| | | | | | | | it will be useful for attached pictures in ID3v2
* | Merge remote-tracking branch 'qatar/master' into masterMichael Niedermayer2011-05-291-0/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * webm: support stereo videos in matroska/webm muxerAlok Ahuja2011-05-281-1/+19
| | | | | | | | | | Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | matroska: improve declaration of video_stereo_* constant tablesAurelien Jacobs2011-05-241-5/+5
| |
* | matroska: cleanup handling of video stereo modeAurelien Jacobs2011-05-241-18/+5
| |
* | matroska: switch stereo mode from int to string and add support in the ↵Kirill Gavrilov2011-05-211-0/+5
| | | | | | | | demuxer too
* | matroska: cosmeticsKirill Gavrilov2011-05-211-17/+17
| |
* | Create a stereo_mode metadata tag to specify the stereo 3d video layout ↵Alok Ahuja2011-05-211-1/+19
|/ | | | using the StereoMode tag in a matroska/webm video track.
* Fix the MATROSKA_ID_TAGDEFAULT to match the specification (instead ofReimar Döffinger2010-06-081-1/+2
| | | | | | libmatroska etc. typo) but continue to support the "old" value. Originally committed as revision 23539 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add some basic metadata conversion tables for matroska and asf.Aurelien Jacobs2009-03-011-0/+2
| | | | | | Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat. Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: add needed definitions forgotten in r17331Aurelien Jacobs2009-02-151-0/+5
| | | | Originally committed as revision 17332 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | 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
* matroskadec: list some more ebml IDs found in the wild and that we ignoreAurelien Jacobs2008-08-131-0/+16
| | | | | | | 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
* matroskadec: add basic tags support (metadata)Aurelien Jacobs2008-08-081-1/+7
| | | | Originally committed as revision 14672 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix small typo.Diego Biurrun2008-08-051-1/+1
| | | | Originally committed as revision 14628 to svn://svn.ffmpeg.org/ffmpeg/trunk
* misc spelling/grammar fixesDiego Biurrun2008-08-051-3/+3
| | | | Originally committed as revision 14616 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: expand useless define for MS compat codec id stringsAurelien Jacobs2008-08-051-3/+0
| | | | Originally committed as revision 14607 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: simplify flag defaultAurelien Jacobs2008-08-051-9/+0
| | | | Originally committed as revision 14550 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: remove storage of various unused flagsAurelien Jacobs2008-08-051-7/+0
| | | | Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroska: add support for A_QUICKTIME/QDM2 codecAurelien Jacobs2008-07-271-1/+1
| | | | Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: remove some useless codeAurelien Jacobs2008-06-161-13/+0
| | | | Originally committed as revision 13783 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: read TrackTimecodeScale and set timebase accordinglyAnton Khirnov2008-06-011-0/+1
| | | | | | patch by Anton Khirnov wyskas _at_ gmail _dot_ com Originally committed as revision 13601 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: silently discard some element ID that we don't care aboutAnton Khirnov2008-06-011-0/+3
| | | | | | patch by Anton Khirnov wyskas _at_ gmail _dot_ com Originally committed as revision 13600 to svn://svn.ffmpeg.org/ffmpeg/trunk
* demux chapters out of matroskaAnton Khirnov2008-05-221-0/+13
| | | | | | patch by Anton Khirnov wyskas _at_ gmail _dot_ com Originally committed as revision 13241 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add MATROSKA_TRACK_TYPE_NONE.Carl Eugen Hoyos2008-05-131-0/+1
| | | | | | Fixes icc warning #188: enumerated type mixed with another type Originally committed as revision 13143 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-1/+1
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: add support for track content encodingAurelien Jacobs2008-05-081-0/+16
| | | | | | Only the header strip method is supported for now. Originally committed as revision 13082 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for Matroska attachments.Evgeniy Stepanov2008-01-271-0/+14
| | | | | | 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
* colour --> color in variable namesDiego Biurrun2007-12-031-1/+1
| | | | Originally committed as revision 11159 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
* Make Matroska demuxer output full frames instead of slices for RealVideoAurelien Jacobs2007-10-211-1/+0
| | | | | | | 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
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add EBML ID for Segment UIDDavid Conrad2007-07-281-0/+1
| | | | Originally committed as revision 9814 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-0/+196
patch by David Conrad umovimus _at_ gmail.com Originally committed as revision 9215 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud