[FFmpeg-devel] [PATCH] matroskadec: set duration also for subtitles.

[Philip Langdale]

On Sun, 17 Jun 2012 18:15:08 +0200
Nicolas George <nicolas.george at normalesup.org> wrote:

> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  libavformat/matroskadec.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> 
> It does not seem to have any advert effect (FATE passes) and seems
> more logical.
> 
> 
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index aaeff21..41c4649 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -2081,8 +2081,7 @@ static int
> matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
> pkt->pos = pos; if (st->codec->codec_id == CODEC_ID_TEXT)
>                      pkt->convergence_duration = duration;
> -                else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
> -                    pkt->duration = duration;
> +                pkt->duration = duration;
>  
>                  if (st->codec->codec_id == CODEC_ID_SSA)
>                      matroska_fix_ass_packet(matroska, pkt, duration);

I had a slightly different patch in my queue. Is the setting of
convergence_duration logical in any way? Shouldn't we just set the
normal duration unconditionally and not bother with convergence_duration
for subtitles? TEXT is the only one where we do it, and it seems to make
no sense whatsoever.

--phil