summaryrefslogtreecommitdiff
path: root/libavformat/matroskaenc.c
Commit message (Collapse)AuthorAge
* Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'Michael Niedermayer2014-10-14
|\ | | | | | | | | | | | | | | | | | | * commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0': lavf: use initial_padding instead of deprecated delay Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use initial_padding instead of deprecated delayAnton Khirnov2014-10-13
| |
* | Fix writing first audio Cues in dash mode.Frank Galligan2014-10-09
| | | | | | | | | | | | | | | | | | In dahsmode Matroska is not writing the first Cluster for every audio stream in the Cues element. Signed-off-by: Frank Galligan <frankgalligan@gmail.com> Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Kill timed SRTClément Bœsch2014-09-30
| |
* | avformat: remove FF_API_ASS_SSA dead codeClément Bœsch2014-09-09
| |
* | avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifierMichael Niedermayer2014-08-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'Michael Niedermayer2014-08-29
|\| | | | | | | | | | | | | | | | | | | * commit '4d686fb721b485ebbc4c7779d927d876c1e630f7': matroskaenc: convert avstream stereo3d side data during encoding Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: convert avstream stereo3d side data during encodingVittorio Giovara2014-08-28
| | | | | | | | Write the StereoMode Embl to bitstream.
* | avformat/matroskaenc: Check alpha_modeMichael Niedermayer2014-08-24
| | | | | | | | | | | | | | Fixes CID1231992 Suggested-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculationMichael Niedermayer2014-08-09
| | | | | | | | | | | | | | | | | | 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>
* | avformat/matroskaenc: print a warning when the relative timestamp wouldnt ↵Michael Niedermayer2014-07-24
| | | | | | | | | | | | | | | | fit in 16bit This is somewhat unusual so its better to use warning level than debug Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: Start new cluster if relative timestamp could not ↵Michael Niedermayer2014-07-24
| | | | | | | | | | | | otherwise be stored Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: Factor mkv_start_new_cluster() outMichael Niedermayer2014-07-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: Don't set language to empty string, use "und"Jan Gerber2014-07-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | * commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4': matroska: Factor out mkv_write_stereo_mode Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: Factor out mkv_write_stereo_modeLuca Barbato2014-07-01
| |
* | Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | * commit 'b75a1f9892b5b715397edbf837e4d4cda337907b': matroska: Factor out write_track from mkv_write_tracks Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: Factor out write_track from mkv_write_tracksLuca Barbato2014-07-01
| |
* | Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | * commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e': matroska: K&R formatting cosmetics Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: K&R formatting cosmeticsLuca Barbato2014-07-01
| |
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 10:30:11 +0000