b76df6efb6
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
...
Fixes remuxing of DVBSUB to mkv.
2015-03-24 10:07:18 +01:00
7a5356c728
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
...
This change allows remuxing hevc from mpeg-ts to Matroska.
2015-03-18 20:35:26 +01:00
e48ff13ba7
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
...
* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
matroskaenc: Fix type used for chapter timestamps
Conflicts:
libavformat/matroskaenc.c
See: a4cd057bc7
2015-03-11 20:09:18 +01:00
9272c965d9
matroskaenc: Fix type used for chapter timestamps
2015-03-11 17:56:51 +00:00
2e8020c66c
Merge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'
...
* commit '9f25a109922da43c1f81273a431d3b40cb5a785a':
matroskaenc: Also validate chapter end time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-09 20:31:22 +01:00
9f25a10992
matroskaenc: Also validate chapter end time
...
This prevents it to be written as unsigned. Also add an error message.
CC: libav-stable@libav.org
Bug-Id: CID 1265717
2015-03-09 12:57:19 +00:00
da7e561964
matroskaenc: Allow writing track "forced" flag
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-24 22:28:51 +01:00
a4cd057bc7
avformat/matroskaenc: Use the correct data type for the chapter times
...
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 20:40:00 +01:00
d302853bca
Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'
...
* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
matroskaenc: Validate chapter start and end times
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 20:25:47 +01:00
5dc47a2bd5
matroskaenc: Validate chapter start and end times
...
CC: libav-stable@libav.org
Bug-Id: CID 1265717
2015-02-17 11:27:41 -05:00
7d60baa8d9
avformat/matroskaenc: add allow_raw_vfw and disable it by default
...
Based on complaint by wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 00:43:38 +01:00
a0fe1a25fa
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
...
* 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>
2015-02-14 21:07:40 +01:00
daf8cf358a
avformat: Don't anonymously typedef structs
2015-02-14 10:13:47 -08:00
9ccc4eedd1
avformat/matroskaenc: Do not use native mode for raw RGB
...
This fixes generating totally unplayable files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 13:02:30 +01:00
e2fb12b629
avformat/matroskaenc: fix handling of VFW style raw rgb
...
raw rgb uses 0 as codec tag in "VFW", the code assumed 0 means error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 13:02:30 +01:00
f95cd5a235
Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'
...
* commit '51da7d02748cc54b7d009115e76efa940b99a8ef':
matroskaenc: refuse to write AAC without valid extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 21:25:49 +01:00
51da7d0274
matroskaenc: refuse to write AAC without valid extradata
2015-01-09 15:51:00 +01:00
988d27b802
Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
...
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
check memory errors from av_strdup()
Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:57:25 +01:00
b1306823d0
check memory errors from av_strdup()
2014-12-18 23:27:14 +01:00
ad2deb02e5
avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers()
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-14 14:30:45 +01:00
69c1fe7c9c
mkv: Validate ASS Start and End fields
...
CC: libav-stable@libav.org
2014-12-03 13:08:41 +00:00
f769671f86
Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'
...
* commit '090c67d586e3916f9acc49e010b6389d07f97153':
matroskaenc: write correct Display{Width, Height} in stereo encoding
Conflicts:
libavformat/matroskaenc.c
See: 6103faaa51
2014-10-27 22:18:03 +01:00
090c67d586
matroskaenc: write correct Display{Width, Height} in stereo encoding
...
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>
2014-10-27 18:21:35 +00:00
8be93ba049
Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'
...
* commit '28c020d4df9b060a58a124a7a5406d4313fbe249':
matroskaenc: check avio_open_dyn_buf return value
Conflicts:
libavformat/matroskaenc.c
See: b1f517f503
2014-10-25 04:45:23 +02:00
28c020d4df
matroskaenc: check avio_open_dyn_buf return value
...
CC: libav-stable@libav.org
Bug-Id: CID 703629
2014-10-24 23:48:57 +01:00
4694c0bb7c
Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'
...
* commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0':
lavf: use initial_padding instead of deprecated delay
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 03:00:17 +02:00
eabdc2a830
lavf: use initial_padding instead of deprecated delay
2014-10-13 19:10:30 +00:00
241b306b1e
Fix writing first audio Cues in dash mode.
...
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>
2014-10-09 21:50:48 +02:00
55180b3299
Kill timed SRT
2014-09-30 20:21:14 +02:00
c7d8dbad14
avformat: remove FF_API_ASS_SSA dead code
2014-09-09 21:34:23 +02:00
37520a91ac
avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 01:26:52 +02:00
39cd9fdbf8
Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
...
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
matroskaenc: convert avstream stereo3d side data during encoding
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 00:44:47 +02:00
4d686fb721
matroskaenc: convert avstream stereo3d side data during encoding
...
Write the StereoMode Embl to bitstream.
2014-08-28 12:35:27 -04:00
c2c4cee866
avformat/matroskaenc: Check alpha_mode
...
Fixes CID1231992
Suggested-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 20:33:17 +02:00
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* 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>
2014-08-15 21:00:50 +02:00
f929ab0569
cosmetics: Write NULL pointer equality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15 03:18:18 -07:00
64d029de41
avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation
...
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>
2014-08-09 05:05:09 +02:00
d44b8f0a47
avformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in 16bit
...
This is somewhat unusual so its better to use warning level than debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 20:25:29 +02:00
7923aa0fba
avformat/matroskaenc: Start new cluster if relative timestamp could not otherwise be stored
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 18:19:50 +02:00
3c6e220a8c
avformat/matroskaenc: Factor mkv_start_new_cluster() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 18:19:11 +02:00
73b7a360d8
matroskaenc: Don't set language to empty string, use "und"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-20 14:03:00 +02:00
141ee10913
Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'
...
* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
matroska: Factor out mkv_write_stereo_mode
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01 20:55:42 +02:00
ee78b0c252
Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'
...
* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
matroska: Factor out write_track from mkv_write_tracks
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01 20:25:35 +02:00
8365287e61
Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'
...
* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
matroska: K&R formatting cosmetics
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01 19:58:57 +02:00
48e6432407
matroska: Factor out mkv_write_stereo_mode
2014-07-01 16:43:20 +02:00
b75a1f9892
matroska: Factor out write_track from mkv_write_tracks
2014-07-01 16:43:01 +02:00
f1f6156b3f
matroska: K&R formatting cosmetics
2014-07-01 16:42:32 +02:00
c80181352c
lavf/matroskaenc: Fix Cues on Audio for WebM DASH
...
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-06 21:36:11 +02:00
955b31a751
Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'
...
* commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52':
flac muxer: support reading updated extradata from side data
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 14:16:29 +02:00
754bf1212c
Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'
...
* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d':
matroskaenc: Allow VP9 and Opus in webm
Conflicts:
libavformat/matroskaenc.c
See: 820ffaed0f
2014-06-01 12:00:20 +02:00
Carl Eugen Hoyos
Michael Niedermayer
Vittorio Giovara
John Stebbins
Diego Biurrun
Anton Khirnov
Luca Barbato
Frank Galligan
Clément Bœsch
Gabriel Dume
Jan Gerber
Vignesh Venkatasubramanian