mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-23 07:42:51 +00:00
4ebfc13c33
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>
49 lines
2.8 KiB
Plaintext
49 lines
2.8 KiB
Plaintext
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 680 size: 208
|
|
ret: 0 st:-1 flags:0 ts:-1.000000
|
|
ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 896 size: 27837
|
|
ret: 0 st:-1 flags:1 ts: 1.894167
|
|
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292312 size: 27834
|
|
ret: 0 st: 0 flags:0 ts: 0.788000
|
|
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292312 size: 27834
|
|
ret: 0 st: 0 flags:1 ts:-0.317000
|
|
ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 896 size: 27837
|
|
ret:-1 st: 1 flags:0 ts: 2.577000
|
|
ret: 0 st: 1 flags:1 ts: 1.471000
|
|
ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320153 size: 209
|
|
ret: 0 st:-1 flags:0 ts: 0.365002
|
|
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146864 size: 27925
|
|
ret: 0 st:-1 flags:1 ts:-0.740831
|
|
ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 896 size: 27837
|
|
ret:-1 st: 0 flags:0 ts: 2.153000
|
|
ret: 0 st: 0 flags:1 ts: 1.048000
|
|
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292312 size: 27834
|
|
ret: 0 st: 1 flags:0 ts:-0.058000
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 680 size: 208
|
|
ret: 0 st: 1 flags:1 ts: 2.836000
|
|
ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320153 size: 209
|
|
ret:-1 st:-1 flags:0 ts: 1.730004
|
|
ret: 0 st:-1 flags:1 ts: 0.624171
|
|
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146864 size: 27925
|
|
ret: 0 st: 0 flags:0 ts:-0.482000
|
|
ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 896 size: 27837
|
|
ret: 0 st: 0 flags:1 ts: 2.413000
|
|
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292312 size: 27834
|
|
ret:-1 st: 1 flags:0 ts: 1.307000
|
|
ret: 0 st: 1 flags:1 ts: 0.201000
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 680 size: 208
|
|
ret: 0 st:-1 flags:0 ts:-0.904994
|
|
ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 896 size: 27837
|
|
ret: 0 st:-1 flags:1 ts: 1.989173
|
|
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292312 size: 27834
|
|
ret: 0 st: 0 flags:0 ts: 0.883000
|
|
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292312 size: 27834
|
|
ret: 0 st: 0 flags:1 ts:-0.222000
|
|
ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 896 size: 27837
|
|
ret:-1 st: 1 flags:0 ts: 2.672000
|
|
ret: 0 st: 1 flags:1 ts: 1.566000
|
|
ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320153 size: 209
|
|
ret: 0 st:-1 flags:0 ts: 0.460008
|
|
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146864 size: 27925
|
|
ret: 0 st:-1 flags:1 ts:-0.645825
|
|
ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 896 size: 27837
|