summaryrefslogtreecommitdiff
path: root/libavformat/matroskaenc.c
Commit message (Collapse)AuthorAge
* lavf/matroskaenc: Fix Cues on Audio for WebM DASHVignesh Venkatasubramanian2014-06-06
| | | | | | | | | | | 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>
* Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'Michael Niedermayer2014-06-01
|\ | | | | | | | | | | | | | | | | | | * commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52': flac muxer: support reading updated extradata from side data Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac muxer: support reading updated extradata from side dataAnton Khirnov2014-06-01
| |
* | Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'Michael Niedermayer2014-06-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d': matroskaenc: Allow VP9 and Opus in webm Conflicts: libavformat/matroskaenc.c See: 820ffaed0f64b7ec27275d093c6f81e181c86e94 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Allow VP9 and Opus in webmTudor Suciu2014-06-01
| | | | | | | | | | | | Bug-Id: 695 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libavformat: output cues for each subtitle block in MKV muxerJohn Peebles2014-05-31
| | | | | | | | | | Signed-off-by: John Peebles <johnpeeb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * matroskaenc: set the stream timebase earlierAnton Khirnov2014-05-29
| | | | | | | | Fixes calculating the ts offset for audio codecs with delay.
* | Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * matroskaenc: base DefaultDuration on the framerate, not the codec timebaseAnton Khirnov2014-05-29
| | | | | | | | | | | | 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.
* | lavf: Remove experimental flag for Opus in WebMVignesh Venkatasubramanian2014-05-28
| | | | | | | | | | | | | | | | | | | | 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>
* | avformat/matroskaenc: fix ident stringMichael Niedermayer2014-05-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '106b62f4ba600f24415eaded5e020aeceb23fd59': matroskaenc: write the channel mask for FLAC Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write the channel mask for FLACAnton Khirnov2014-05-28
| |
* | libavformat/matroskaenc: Add WebM DASH supportVignesh Venkatasubramanian2014-05-22
| | | | | | | | | | | | | | | | | | | | | | 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>
* | avformat/matroskaenc: switch to AVFMT_FLAG_BITEXACTMichael Niedermayer2014-05-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'Michael Niedermayer2014-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: add AVFMT_FLAG_BITEXACT.Anton Khirnov2014-05-15
| | | | | | | | | | | | | | | | 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.
* | avformat/matroskaenc: use av_mallocz_array()Michael Niedermayer2014-05-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use Matroska document version 2 for WebM files if possible.Carl Eugen Hoyos2014-05-12
| | | | | | | | | | | | | | Google's plugin for the Internet Explorer refuses to play files with another document version. Fixes ticket #3583.
* | Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'Michael Niedermayer2014-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * matroskaenc: write CodecDelayAnton Khirnov2014-05-01
| |
* | ff_put_wav_header: add flag to force WAVEFORMATEXDaniel Verkamp2014-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avformat/matroskaenc: fix indention levelMichael Niedermayer2014-04-26
| | | | | | | | | | Fixes CID1206644 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Set Matroska private data when muxing Prores.Carl Eugen Hoyos2014-04-06
| | | | | | | | The specification requires the mov code point to be written as "fourcc".
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * qatar/master: matroskaenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker2014-03-09
| |
* | Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit 'a823d0948683bd97dd58556b5740e434166209a8': matroskaenc: write private data in hvcC format for HEVC. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 11:14:02 +0000