• Andreas Rheinhardt's avatar
    avformat/matroskaenc: Don't ignore tags of chapters written late · 4ebfc13c
    Andreas Rheinhardt authored
    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: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
    4ebfc13c
Name
Last commit
Last update
..
acodec-adpcm-ima_qt Loading commit data...
acodec-adpcm-ima_qt-trellis Loading commit data...
acodec-adpcm-ima_wav Loading commit data...
acodec-adpcm-ima_wav-trellis Loading commit data...
acodec-adpcm-ms Loading commit data...
acodec-adpcm-ms-trellis Loading commit data...
acodec-adpcm-swf Loading commit data...
acodec-adpcm-swf-trellis Loading commit data...
acodec-adpcm-yamaha Loading commit data...
acodec-adpcm-yamaha-trellis Loading commit data...
acodec-alac Loading commit data...
acodec-flac Loading commit data...
acodec-mp2 Loading commit data...
acodec-pcm-alaw Loading commit data...
acodec-pcm-f32be Loading commit data...
acodec-pcm-f32le Loading commit data...
acodec-pcm-f64be Loading commit data...
acodec-pcm-f64le Loading commit data...
acodec-pcm-mulaw Loading commit data...
acodec-pcm-s16be Loading commit data...
acodec-pcm-s16le Loading commit data...
acodec-pcm-s24be Loading commit data...
acodec-pcm-s24le Loading commit data...
acodec-pcm-s32be Loading commit data...
acodec-pcm-s32le Loading commit data...
acodec-pcm-s8 Loading commit data...
acodec-pcm-u8 Loading commit data...
cache-pipe Loading commit data...
empty-edit-mp4 Loading commit data...
extra-mp3 Loading commit data...
extra-mp4 Loading commit data...
lavf-aiff Loading commit data...
lavf-al Loading commit data...
lavf-asf Loading commit data...
lavf-au Loading commit data...
lavf-avi Loading commit data...
lavf-bmp Loading commit data...
lavf-dv Loading commit data...
lavf-flv Loading commit data...
lavf-gif Loading commit data...
lavf-gxf Loading commit data...
lavf-jpg Loading commit data...
lavf-mkv Loading commit data...
lavf-mmf Loading commit data...
lavf-mov Loading commit data...
lavf-mpg Loading commit data...
lavf-mxf Loading commit data...
lavf-mxf_d10 Loading commit data...
lavf-mxf_dv25 Loading commit data...
lavf-mxf_dvcpro50 Loading commit data...
lavf-mxf_opatom Loading commit data...
lavf-mxf_opatom_audio Loading commit data...
lavf-nut Loading commit data...
lavf-ogg Loading commit data...
lavf-pbmpipe Loading commit data...
lavf-pcx Loading commit data...
lavf-pgm Loading commit data...
lavf-pgmpipe Loading commit data...
lavf-ppm Loading commit data...
lavf-ppmpipe Loading commit data...
lavf-rm Loading commit data...
lavf-sgi Loading commit data...
lavf-swf Loading commit data...
lavf-tga Loading commit data...
lavf-tiff Loading commit data...
lavf-ts Loading commit data...
lavf-ul Loading commit data...
lavf-voc Loading commit data...
lavf-wav Loading commit data...
lavf-wtv Loading commit data...
lavf-y4m Loading commit data...
mkv-codec-delay Loading commit data...
test-iibbibb-mp4 Loading commit data...
test-iibbibb-neg-ctts-mp4 Loading commit data...
vsynth_lena-asv1 Loading commit data...
vsynth_lena-asv2 Loading commit data...
vsynth_lena-dnxhd-1080i Loading commit data...
vsynth_lena-dnxhd-4k-hr-lb Loading commit data...
vsynth_lena-dnxhd-720p Loading commit data...
vsynth_lena-dnxhd-720p-rd Loading commit data...
vsynth_lena-dv Loading commit data...
vsynth_lena-dv-411 Loading commit data...
vsynth_lena-dv-50 Loading commit data...
vsynth_lena-ffv1 Loading commit data...
vsynth_lena-flashsv Loading commit data...
vsynth_lena-flv Loading commit data...
vsynth_lena-h261 Loading commit data...
vsynth_lena-h263 Loading commit data...
vsynth_lena-h263p Loading commit data...
vsynth_lena-huffyuv Loading commit data...
vsynth_lena-jpegls Loading commit data...
vsynth_lena-ljpeg Loading commit data...
vsynth_lena-mjpeg Loading commit data...
vsynth_lena-mpeg1 Loading commit data...
vsynth_lena-mpeg1b Loading commit data...
vsynth_lena-mpeg2-422 Loading commit data...
vsynth_lena-mpeg2-idct-int Loading commit data...
vsynth_lena-mpeg2-ilace Loading commit data...
vsynth_lena-mpeg2-ivlc-qprd Loading commit data...
vsynth_lena-mpeg2-thread Loading commit data...
vsynth_lena-mpeg2-thread-ivlc Loading commit data...
vsynth_lena-mpeg4 Loading commit data...
vsynth_lena-mpeg4-adap Loading commit data...
vsynth_lena-mpeg4-adv Loading commit data...
vsynth_lena-mpeg4-error Loading commit data...
vsynth_lena-mpeg4-nr Loading commit data...
vsynth_lena-mpeg4-nsse Loading commit data...
vsynth_lena-mpeg4-qpel Loading commit data...
vsynth_lena-mpeg4-qprd Loading commit data...
vsynth_lena-mpeg4-rc Loading commit data...
vsynth_lena-mpeg4-thread Loading commit data...
vsynth_lena-msmpeg4 Loading commit data...
vsynth_lena-msmpeg4v2 Loading commit data...
vsynth_lena-rgb Loading commit data...
vsynth_lena-roqvideo Loading commit data...
vsynth_lena-rv10 Loading commit data...
vsynth_lena-rv20 Loading commit data...
vsynth_lena-snow Loading commit data...
vsynth_lena-snow-ll Loading commit data...
vsynth_lena-svq1 Loading commit data...
vsynth_lena-wmv1 Loading commit data...
vsynth_lena-wmv2 Loading commit data...
vsynth_lena-yuv Loading commit data...