[FFmpeg-devel] [PATCH] ffmpeg: prevent premature EOF in sub2video with nullptr AVSubtitles

[Jan Ekström]

On Thu, Mar 29, 2018 at 1:14 PM, Michael Niedermayer
<michael at niedermayer.cc> wrote:
>
> this breaks fate-sub2video
>
> TEST    sub2video
> --- ./tests/ref/fate/sub2video  2018-03-29 02:30:48.095578219 +0200
> +++ tests/data/fate/sub2video   2018-03-29 12:13:25.191428538 +0200
> @@ -68,7 +68,8 @@
>  0,        258,        258,        1,   518400, 0x34cdddee
>  0,        269,        269,        1,   518400, 0xbab197ea
>  1,   53910000,   53910000,  2696000,     2095, 0x61bb15ed, F=0x0
> -0,        270,        270,        1,   518400, 0x4db4ce51
> +0,        270,        270,        1,   518400, 0xbab197ea
> +0,        271,        271,        1,   518400, 0x4db4ce51
>  0,        283,        283,        1,   518400, 0xbab197ea
>  1,   56663000,   56663000,  1262000,     1013, 0xc9ae89b7, F=0x0
>  0,        284,        284,        1,   518400, 0xe6bc0ea9
> @@ -137,7 +138,7 @@
>  1,  168049000,  168049000,  1900000,     1312, 0x0bf20e8d, F=0x0
>  0,        850,        850,        1,   518400, 0xbab197ea
>  1,  170035000,  170035000,  1524000,     1279, 0xb6c2dafe, F=0x0
> -0,        851,        851,        1,   518400, 0x8780239e
> +0,        851,        851,        1,   518400, 0xbab197ea
>  0,        858,        858,        1,   518400, 0xbab197ea
>  0,        861,        861,        1,   518400, 0x6eb72347
>  1,  172203000,  172203000,  1695000,     1826, 0x9a1ac769, F=0x0
> @@ -161,7 +162,8 @@
>  0,        976,        976,        1,   518400, 0x923d1ce7
>  0,        981,        981,        1,   518400, 0xbab197ea
>  1,  196361000,  196361000,  1524000,     1715, 0x695ca41e, F=0x0
> -0,        982,        982,        1,   518400, 0x6e652cd2
> +0,        982,        982,        1,   518400, 0xbab197ea
> +0,        983,        983,        1,   518400, 0x6e652cd2
>  0,        989,        989,        1,   518400, 0xbab197ea
>  1,  197946000,  197946000,  1160000,      789, 0xc63a189e, F=0x0
>  0,        990,        990,        1,   518400, 0x25113966
> Test sub2video failed. Look at tests/data/fate/sub2video.err for details.
> make: *** [fate-sub2video] Error 1

Thanks. I tried running this last night but it required some of the
samples in FATE so I decided to re-run it today. Will check if the
change is correct. For the reference, this change has now been running
in a testing setup for at least 24h with the subtitles still being
overlayed correctly, so the change seems alright by the general
metrics (that I can gather).

Jan