mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
9bde6c6be0
Up until now, the microdvd demuxer uses av_strdup() to allocate the extradata from a string; its length is set to strlen() + 1, i.e. including the \0 at the end. Upon remuxing, the muxer would simply copy the extradata at the beginning, including the \0. This commit changes this by not adding the \0 to the size of the extradata; the muxer now delimits extradata by inserting a \n. This required to change the subtitles-microdvd-remux FATE-test. Furthermore, the extradata is now allocated with zeroed padding. The microdvd decoder is not affected by this, as it didn't use the size of the extradata at all, but treated it as a C-string. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 lines
416 B
Plaintext
12 lines
416 B
Plaintext
{DEFAULT}{}{F:Comic Sans MS}{S:30}{c:$123456}
|
|
{1000}{1300}{c:$345678}foo|{c:$abcdef}bar|bla
|
|
{1300}{1400}{Y:ib}{y:us}italic bold underline strike|italic bold no-underline no-strike
|
|
{1400}{1500}back to
|
|
{1500}{1600}the future
|
|
{2000}{2123}{o:10,20}Some more crazy stuff
|
|
{3350}{3390}this subtitle...
|
|
{3390}{4000}...continues up to...
|
|
{4000}{4500}this one.
|
|
{4600}{4800}and now...
|
|
{4800}{}...to the end of the presentation
|