Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat/matroskaenc.c
AgeCommit message (Collapse)Author
2014-08-11avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculationMichael Niedermayer
Fixes assertion failure Fixes Ticket3822 as a side-effect this makes some mkv files a few bytes smaller Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 64d029de41ed556b765df50c7080b06fd5a86417) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'Michael Niedermayer
* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4': matroska: Factor out mkv_write_stereo_mode Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'Michael Niedermayer
* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b': matroska: Factor out write_track from mkv_write_tracks Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'Michael Niedermayer
* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e': matroska: K&R formatting cosmetics Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01matroska: Factor out mkv_write_stereo_modeLuca Barbato
2014-07-01matroska: Factor out write_track from mkv_write_tracksLuca Barbato
2014-07-01matroska: K&R formatting cosmeticsLuca Barbato
2014-06-06lavf/matroskaenc: Fix Cues on Audio for WebM DASHVignesh Venkatasubramanian
Fix a change that was broken by [1]. Cues must be added for audio frames on cluster start for WebM when the DASH flag is passed. Restoring correct functionality. [1] http://goo.gl/xYLq7Z Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'Michael Niedermayer
* commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52': flac muxer: support reading updated extradata from side data Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'Michael Niedermayer
* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d': matroskaenc: Allow VP9 and Opus in webm Conflicts: libavformat/matroskaenc.c See: 820ffaed0f64b7ec27275d093c6f81e181c86e94 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01flac muxer: support reading updated extradata from side dataAnton Khirnov
2014-06-01matroskaenc: Allow VP9 and Opus in webmTudor Suciu
Bug-Id: 695 Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-31libavformat: output cues for each subtitle block in MKV muxerJohn Peebles
Signed-off-by: John Peebles <johnpeeb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'Michael Niedermayer
* commit '962d63157322466a9a82f9f9d84c1b6f1b582f65': matroskaenc: set the stream timebase earlier Conflicts: tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'Michael Niedermayer
* commit '81eec081afea9fc017a175581ceea7c420a0dfc3': matroskaenc: base DefaultDuration on the framerate, not the codec timebase Conflicts: libavformat/matroskaenc.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv See: ea83b032af825d10f7d6db8a71933edce5b842a3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29matroskaenc: set the stream timebase earlierAnton Khirnov
Fixes calculating the ts offset for audio codecs with delay.
2014-05-29matroskaenc: base DefaultDuration on the framerate, not the codec timebaseAnton Khirnov
This results in DefaultDuration not being written when the framerate is not known, but as this field is purely informative, this should not break any sane demuxers.
2014-05-28lavf: Remove experimental flag for Opus in WebMVignesh Venkatasubramanian
Opus in WebM is no more experimental as we have everything necessary in the container writing code as per the spec. So removing the experimental flag. Note that we removed the experimental suffix from the CodecId field long ago ( http://goo.gl/O0TYRB ). Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28avformat/matroskaenc: fix ident stringMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'Michael Niedermayer
* commit '106b62f4ba600f24415eaded5e020aeceb23fd59': matroskaenc: write the channel mask for FLAC Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28matroskaenc: write the channel mask for FLACAnton Khirnov
2014-05-22libavformat/matroskaenc: Add WebM DASH supportVignesh Venkatasubramanian
WebM DASH specification [1] requires the Clusters and Cues to be output in a specific way. Adding a flag to matroskaenc that will enable support for creating WebM/Mkv files conforming to the WebM DASH specification. [1] http://wiki.webmproject.org/adaptive-streaming/webm-dash-specification Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18avformat/matroskaenc: switch to AVFMT_FLAG_BITEXACTMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'Michael Niedermayer
* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52': lavf: add AVFMT_FLAG_BITEXACT. Conflicts: doc/APIchanges libavformat/avformat.h libavformat/flacenc.c libavformat/movenc.c libavformat/oggenc.c libavformat/options_table.h libavformat/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15lavf: add AVFMT_FLAG_BITEXACT.Anton Khirnov
Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's codec context. Using codec options inside lavf is fragile and can easily break when the muxing codec context is not the encoding context.
2014-05-15avformat/matroskaenc: use av_mallocz_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12Use Matroska document version 2 for WebM files if possible.Carl Eugen Hoyos
Google's plugin for the Internet Explorer refuses to play files with another document version. Fixes ticket #3583.
2014-05-01Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'Michael Niedermayer
* commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1': matroskaenc: write CodecDelay Conflicts: libavformat/matroskaenc.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv This is largely not merged as it causes assertion failures and av sync errors Further investigation of this is warranted if the changes are found to fix/improve something in relation to d92b1b1babe69268971863649c225e1747358a74 See: d92b1b1babe69268971863649c225e1747358a74 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01matroskaenc: write CodecDelayAnton Khirnov
2014-04-30ff_put_wav_header: add flag to force WAVEFORMATEXDaniel Verkamp
Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e: riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs. This flag is used in the Matroska muxer (the cause of the original change) and in the ASF muxer, because the specifications for these formats indicate explicitly that WAVEFORMATEX should be used. Muxers for other formats will return to the original behavior of writing PCMWAVEFORMAT when writing a header for raw PCM. In particular, this causes raw PCM in WAV to generate the canonical 44-byte header expected by some tools. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27avformat/matroskaenc: fix indention levelMichael Niedermayer
Fixes CID1206644 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07Set Matroska private data when muxing Prores.Carl Eugen Hoyos
The specification requires the mov code point to be written as "fourcc".
2014-03-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: matroskaenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-10Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'Michael Niedermayer
* commit 'a823d0948683bd97dd58556b5740e434166209a8': matroskaenc: write private data in hvcC format for HEVC. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker
2014-03-09matroskaenc: write private data in hvcC format for HEVC.Tim Walker
2014-03-09Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'Michael Niedermayer
* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d': matroskaenc: allow override of "writing application" tag Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08matroskaenc: allow override of "writing application" tagJohn Stebbins
Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org
2014-01-23avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks ↵Michael Niedermayer
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>
2014-01-16Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.Carl Eugen Hoyos
The value is wrong and leads to broken files.
2014-01-05avformat/matroskaenc: warn when muxing video codec not supported by formatPeter Ross
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>
2013-12-23riffenc: add option to ff_put_bmp_header to ignore extradataPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-11-16lavf/matroska*: DiscardPadding is a signed integerJan Gerber
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>
2013-11-16avformat/matroska: simplify signed int access codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16lavf/matroska*: add support for signed integersJan Gerber
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29matroskaenc: fixed display width / height calculation for stereo modeMichael Niedermayer
Based-on: patch by Asan Usipov <asan.usipov@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21matroska: Add the CueDuration elementJames Almer
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>
2013-09-21matroskaenc: Add CuePoints for subtitle tracksJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 10:46:50 +0300