RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests/ref/lavf
History
Andreas Rheinhardt 4ebfc13c33 avformat/matroskaenc: Don't ignore tags of chapters written late 
The Matroska muxer writes the Chapters early when chapters were already
available when writing the header; in this case any tags pertaining to
these chapters get written, too.

Yet if no chapters had been supplied before writing the header, Chapters
can also be written when writing the trailer if any are supplied. Tags
belonging to these chapters were up until now completely ignored.

This commit changes this: Writing the tags belonging to chapters has
been moved to mkv_write_chapters(). If mkv_write_tags() has not been
called yet (i.e. when chapters are written when writing the header),
the AVIOContext for writing the ordinary Tags element is used, but not
output, as this is left to mkv_write_tags() in order to only write one
Tags element. Yet if mkv_write_tags() has already been called,
mkv_write_chapters() will output a Tags element of its own which only
contains the tags for chapters.

When chapters are available initially, the corresponding tags will now
be the first tags in the Tags element; but the ordering of tags in Tags
is irrelevant anyway.

This commit also makes chapter_id_offset local to mkv_write_chapters()
as it is used only there and not reused at all.

Potentially writing a second Tags element means that the maximum number
of SeekHead entries had to be incremented. All the changes to FATE
result from the ensuing increase in the amount of space reserved for the
SeekHead (21 bytes more).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 		2020-05-19 03:34:44 +02:00
..
aiff Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
al
…
apng Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
apng.png Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
asf Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
ast Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
au Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
avi Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
bmp Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
caf Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
dpx Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
dv Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
dv_ntsc Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
dv_pal Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
flm Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
flv Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
gbrap.fits Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
gbrap16be.fits Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
gbrp.fits Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
gbrp10le.dpx Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
gbrp12le.dpx Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
gbrp16be.fits Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
gif Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
gray.fits Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
gray.pam Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
gray.xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
gray16be.fits avcodec/fitsdec: Use lrint() 2019-12-05 20:20:05 +01:00
gray16be.pam fate/lavf-image: fix passed arguments for some high bit depth tests 2019-03-14 17:15:28 -03:00
gray16be.png Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
gxf Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
gxf_ntsc Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
gxf_pal Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
ircam Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
ismv avformat/movenc: write the major brand also as the first compatible brand 2019-12-21 11:57:28 -03:00
jpg Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
mka avformat/matroskaenc: Don't ignore tags of chapters written late 2020-05-19 03:34:44 +02:00
mkv avformat/matroskaenc: Don't ignore tags of chapters written late 2020-05-19 03:34:44 +02:00
mkv_attachment avformat/matroskaenc: Don't ignore tags of chapters written late 2020-05-19 03:34:44 +02:00
mmf Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
monob.pam Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
monow.xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
mov avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
mov_rtphint avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
mp4 avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
mpg Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
mxf avformat/mxfenc: use a zero based continuity counter 2020-03-02 22:01:47 +01:00
mxf_d10 Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
mxf_dv25 Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
mxf_dvcpro50 Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
mxf_opatom Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
mxf_opatom_audio Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
nut Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
ogg Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
pam Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
pbmpipe Merge commit 'a70eac7a9b193e8434b5bed90bd72aa4cb688363' 2019-03-14 14:15:46 -03:00
pcx Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
peak.wav Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
peak_only.wav Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
pgm Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
pgmpipe Merge commit 'a70eac7a9b193e8434b5bed90bd72aa4cb688363' 2019-03-14 14:15:46 -03:00
png Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
ppm Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
ppmpipe
…
rgb4_byte.xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgb8.xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgb48be.pam fate/lavf-image: fix passed arguments for some high bit depth tests 2019-03-14 17:15:28 -03:00
rgb48be.png Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgb48le.dpx Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgb48le_10.dpx fate/lavf-image: fix passed arguments for some high bit depth tests 2019-03-14 17:15:28 -03:00
rgb555be.xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgb565be.xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgba.pam Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgba.xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rgba64le.dpx Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
rm Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
rso
…
s16.voc Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
sgi Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
smjpeg Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
sox
…
sun Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
swf Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
tga Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
tiff Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
ts avformat/mpegtsenc: get rid of packet counting for sdt/pat/pmt 2019-08-23 22:49:01 +02:00
tta Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
ul
…
voc Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
w64 Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
wav Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
wtv Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
wv Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
xbm Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
xwd Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40' 2019-03-14 14:30:08 -03:00
y4m
…