[FFmpeg-devel] [PATCH] matroskadec: Only merge SSA packets together

[Aurelien Jacobs]

On Wed, Jun 30, 2010 at 05:24:58AM -0400, David Conrad wrote:
> Fixes issue 2052
> ---
>  libavformat/matroskadec.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index 69c81b0..8dc5e81 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -1773,7 +1773,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
>                  if (matroska->prev_pkt &&
>                      timecode != AV_NOPTS_VALUE &&
>                      matroska->prev_pkt->pts == timecode &&
> -                    matroska->prev_pkt->stream_index == st->index)
> +                    matroska->prev_pkt->stream_index == st->index &&
> +                    st->codec->codec_id == CODEC_ID_SSA)
>                      matroska_merge_packets(matroska->prev_pkt, pkt);
>                  else {
>                      dynarray_add(&matroska->packets,&matroska->num_packets,pkt);

Looks OK.

Aurel