summaryrefslogtreecommitdiff
path: root/libavformat/matroskaenc.c
Commit message (Collapse)AuthorAge
* lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.Carl Eugen Hoyos2015-03-18
| | | | This change allows remuxing hevc from mpeg-ts to Matroska.
* Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'Michael Niedermayer2015-03-11
|\ | | | | | | | | | | | | | | | | | | | | * commit '9272c965d9559a90ee64d46aebd99c117e07f7a3': matroskaenc: Fix type used for chapter timestamps Conflicts: libavformat/matroskaenc.c See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Fix type used for chapter timestampsVittorio Giovara2015-03-11
| |
* | Merge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | * commit '9f25a109922da43c1f81273a431d3b40cb5a785a': matroskaenc: Also validate chapter end time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Also validate chapter end timeVittorio Giovara2015-03-09
| | | | | | | | | | | | | | This prevents it to be written as unsigned. Also add an error message. CC: libav-stable@libav.org Bug-Id: CID 1265717
| * matroskaenc: Allow writing track "forced" flagJohn Stebbins2015-02-24
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/matroskaenc: Use the correct data type for the chapter timesMichael Niedermayer2015-02-17
| | | | | | | | | | | | Fixes potential integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | * commit '5dc47a2bd52e375ed742c45d08356b45098f458d': matroskaenc: Validate chapter start and end times Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Validate chapter start and end timesVittorio Giovara2015-02-17
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1265717
* | avformat/matroskaenc: add allow_raw_vfw and disable it by defaultMichael Niedermayer2015-02-15
| | | | | | | | | | | | Based on complaint by wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-14
| |
* | avformat/matroskaenc: Do not use native mode for raw RGBMichael Niedermayer2015-02-14
| | | | | | | | | | | | This fixes generating totally unplayable files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: fix handling of VFW style raw rgbMichael Niedermayer2015-02-14
| | | | | | | | | | | | raw rgb uses 0 as codec tag in "VFW", the code assumed 0 means error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'Michael Niedermayer2015-01-09
|\| | | | | | | | | | | | | * commit '51da7d02748cc54b7d009115e76efa940b99a8ef': matroskaenc: refuse to write AAC without valid extradata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: refuse to write AAC without valid extradataAnton Khirnov2015-01-09
| |
* | Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'Michael Niedermayer2014-12-19
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e': check memory errors from av_strdup() Conflicts: avprobe.c libavformat/matroskaenc.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * check memory errors from av_strdup()Vittorio Giovara2014-12-18
| |
| * mkv: Validate ASS Start and End fieldsLuca Barbato2014-12-03
| | | | | | | | CC: libav-stable@libav.org
* | avcodec/xiph: mark returned header pointers const from ↵Michael Niedermayer2014-12-14
| | | | | | | | | | | | | | avpriv_split_xiph_headers() Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'Michael Niedermayer2014-10-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '090c67d586e3916f9acc49e010b6389d07f97153': matroskaenc: write correct Display{Width, Height} in stereo encoding Conflicts: libavformat/matroskaenc.c See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write correct Display{Width, Height} in stereo encodingVittorio Giovara2014-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | should be the raw amount of pixels (for example 3840x1080 for full HD side by side) and the DisplayWidth/Height in pixels should be the amount of pixels for one plane (1920x1080 for that full HD stream)." So, move the aspect ratio check in the mkv_write_stereo_mode() function and always write the embl when stereo format and/or aspect ration is set. Also add a few comments to that function. CC: libav-stable@libav.org Found-by: Asan Usipov <asan.usipov@gmail.com>
* | Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'Michael Niedermayer2014-10-25
|\| | | | | | | | | | | | | | | | | | | | | * commit '28c020d4df9b060a58a124a7a5406d4313fbe249': matroskaenc: check avio_open_dyn_buf return value Conflicts: libavformat/matroskaenc.c See: b1f517f503139ab9d0c406228b53663e86a128df Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: check avio_open_dyn_buf return valueVittorio Giovara2014-10-24
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 703629
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 16:55:54 +0000