summaryrefslogtreecommitdiff
path: root/libavformat/matroskaenc.c
Commit message (Collapse)AuthorAge
...
| * matroskaenc: write private data in hvcC format for HEVC.Tim Walker2014-03-09
| |
* | Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | | | * commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d': matroskaenc: allow override of "writing application" tag Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: allow override of "writing application" tagJohn Stebbins2014-03-08
| | | | | | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org
* | avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks ↵Michael Niedermayer2014-01-23
| | | | | | | | | | | | | | | | | | | | like its part of quicktime stsd This is needed for matroska spec compliance Fixes playback of SVQ3 in matroska with vlc Fixes Ticket 3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.Carl Eugen Hoyos2014-01-15
| | | | | | | | The value is wrong and leads to broken files.
* | avformat/matroskaenc: warn when muxing video codec not supported by formatPeter Ross2014-01-05
| | | | | | | | | | | | | | | | | | | | This occurs for video codecs that have codec_tag set, but are are not listed in ff_codec_bmp_tags (e.g. AV_CODEC_ID_BINKAUDIO, AV_CODEC_ID_IFF_ILBM). Fixes ticket #3269. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riffenc: add option to ff_put_bmp_header to ignore extradataPeter Ross2013-12-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
* | lavf/matroska*: DiscardPadding is a signed integerJan Gerber2013-11-16
| | | | | | | | | | | | | | | | | | | | according to the Matriska Specification http://matroska.org/technical/specs/index.html DiscardPadding is a signed integer. Tested-by: Jan Gerber <j@v2v.cc> Tested-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroska: simplify signed int access codeMichael Niedermayer2013-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroska*: add support for signed integersJan Gerber2013-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: fixed display width / height calculation for stereo modeMichael Niedermayer2013-10-29
| | | | | | | | | | Based-on: patch by Asan Usipov <asan.usipov@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroska: Add the CueDuration elementJames Almer2013-09-21
| | | | | | | | | | | | | | | | | | Use it only on subtitle CuePoints. With proper demuxer/splitter support this should improve the display of subtitles right after seeking to a given point in the stream. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: Add CuePoints for subtitle tracksJames Almer2013-09-20
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: Write muxingapp and writingapp elements when using bitexact flagJames Almer2013-09-18
| | | | | | | | | | | | | | | | Files won't validate with mkvalidtor if these two elements are missing. Use a const "Lavf" string that wont change with library version bumps. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: Bump DocTypeVersion to 4James Almer2013-09-15
| | | | | | | | | | | | | | | | | | The muxer has been creating files with v4 elements for some time now, and especially now that we can mux non-experimental Opus files, reporting the DocTypeVersion as 2 is not correct. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring Conflicts: libavformat/matroskaenc.c Mostly not merged as the buggy code was no longer part of FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Fix stray pointers left over from av_reallocp_array refactoringAlexandra Khirnova2013-09-12
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/matroskaenc: use av_realloc_array()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: use av_freep() to avoid leaving stale pointersMichael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: functions that add entries should not destroy the ↵Michael Niedermayer2013-09-11
| | | | | | | | | | | | | | | | whole list on failure This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'Michael Niedermayer2013-09-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f369b9356c4606cd4d713d60f7db5de119d901fa': avformat: Use av_reallocp_array() where suitable Conflicts: libavformat/asfenc.c libavformat/gxfenc.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp_array() where suitableAlexandra Khirnova2013-09-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavf/matroska: Adding support for Opus CodecDelayVignesh Venkatasubramanian2013-09-10
| | | | | | | | | | | | | | | | | | | | | | | | In order to represent the codec delay accurately in Matroska, a new element CodecDelay has been introduced. It contains the overall delay added by the codec in nanoseconds. This patch adds support for muxing CodecDelay value in the container. Matroska spec for CodecDelay element can be found here: http://matroska.org/technical/specs/index.html#CodecDelay Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | opus/matroska: Adding support for DiscardPadding in muxerVignesh Venkatasubramanian2013-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for end trimming Opus in Matroska is implemented by using the DiscardPadding container element in the Block data. The last chunk is stored as a Block instead of SimpleBlock and the trimming information is stored and used to discard samples that were padded by the Opus codec. This patch adds support for muxing DiscardPadding element into the container with appropriate value. Matroska spec for the DiscardPadding element can be found here: http://matroska.org/technical/specs/index.html#DiscardPadding Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/subtitles: add a next line jumper and use it.Clément Bœsch2013-09-08
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a bunch of possible overread in avformat with the idiom p += strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no '\n' is found, so the +1 leads to an overread). Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is added because only the header is required for ff_subtitles_next_line(). Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite loop in the probing since there is no more forced increment.
* | avformat/matroskaenc: remove bogus prores tagPaul B Mahol2013-09-08
| | | | | | | | | | | | Fixes: ffmpeg -i input -c:v prores output.mkv Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-05
|\| | | | | | | | | | | | | | | | | | | * qatar/master: matroskaenc: Allow chapters to be written in trailer Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Allow chapters to be written in trailerJohn Stebbins2013-09-04
| | | | | | | | | | | | | | | | This allows creation of frame accurate chapter marks from sources like DVD and BD where the precise chapter location is not known until the chapter mark has been reached during reading. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'Michael Niedermayer2013-08-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca': matroskaenc: Fix writing TRACKDEFAULTFLAG Conflicts: libavformat/matroskaenc.c tests/fate/wavpack.mak tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Fix writing TRACKDEFAULTFLAGJohn Stebbins2013-08-27
| | | | | | | | | | | | | | | | The element was only being written when the value == 1. But the default value of this element is 1, so this has no useful effect. This element needs to be written when the value == 0. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4': mkv: Allow flushing the current cluster in progress Conflicts: libavformat/matroskaenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Allow flushing the current cluster in progressMartin Storsjö2013-08-19
| | | | | | | | | | | | | | | | Allow emitting the current cluster that is being written before starting a new one, simplifying how to figure out where clusters are positioned in the output stream (for live streaming). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '59f595921eb2b848a80a74aa81b6bb43038c9ebe'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | * commit '59f595921eb2b848a80a74aa81b6bb43038c9ebe': mkv: Flush the old cluster before writing a new one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Flush the old cluster before writing a new oneLuca Barbato2013-08-19
| | | | | | | | | | | | | | This simplifies keeping track of cluster boundaries for e.g. livestreaming of WebM. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '98308bd44face14ea3142b501d16226eec23b75a'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | * commit '98308bd44face14ea3142b501d16226eec23b75a': mkv: Add options for specifying cluster limits Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Add options for specifying cluster limitsLuca Barbato2013-08-19
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | * commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a': mkv: Refactor mkv_write_packet Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Refactor mkv_write_packetLuca Barbato2013-08-19
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | matroskaenc: remove unneeded wavpack tagPaul B Mahol2013-08-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/matroska: Adding the new SeekPreRoll elementVignesh Venkatasubramanian2013-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | In order to encapsuate Opus in Matroska, there is a new element that has been added to the Matroska Spec, SeekPreRoll. It has the duration in nanoseconds that has to be decoded before every seek. Spec: http://matroska.org/technical/specs/index.html#SeekPreRoll Proposal for encapsulateing Opus in Matroska: http://wiki.xiph.org/MatroskaOpus Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: make 2 tables static that are not used outside matroskaencMichael Niedermayer2013-08-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: implement CueRelativePositionBernie Habermeier2013-07-24
| | | | | | | | | | | | | | | | | | | | This is a minimal change to matroskaenc that implements CueRelativePosition in the output. Most players will probably ignore this additional information, but it is in the matroska spec, and it'd be nice to be able to make use of it. Signed-off-by: Bernt Habermeier <bernt@wulfram.com> Tested-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: Only change chapter ids if needed.Michael Niedermayer2013-07-19
| | | | | | | | | | | | | | | | This also fixes the case where negative chapter ids where input And fixes the case where remuxing from mkv changed chapter ids Found-by: Luca Barbato Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskaenc: using valid chapter idsFabian Neundorf2013-07-18
| | | | | | | | | | | | | | Fixes ticket 2790, by starting the ChapterUIDs in mkv files with 1 instead of a 0.   Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: simplify mkv_check_tag()Michael Niedermayer2013-07-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskaenc: Check for valid metadata before creating tagsJames Almer2013-07-17
| | | | | | | | | | | | | | | | | | | | | | Tags must have at least one SimpleTag element to be spec conformant. Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by this. Fixes ticket #2785 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: use ffio_fill()Paul B Mahol2013-07-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mastroka audio muxer: Set long_name to Matroska Audio so that it differs ↵Alexis Ballier2013-07-16
| | | | | | | | | | | | from the long_name of matroska video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 06:41:18 +0000