Browse Source

avformat/matroskadec: avcodec/tta: Set extradata_size to 22

Up until c4e0e314, the seek table has been included in the tta
extradata, so that the size of said extradata was 22 (the size of a TTA1
header) + 4 * number of frames. The decoder rejected anything below a
size of 30 and so the Matroska demuxer exported 30 byte long extradata,
of which only 18 were set (it ignores a CRC-32 and simply leaves it at
0). But this is unnecessary since said commit, so reduce the size to 22.

Furthermore, replace 30 by 22 in a comment about the extradata size in
libavcodec/tta.c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
tags/n4.3
Andreas Rheinhardt James Almer 6 years ago
parent
commit
eec26b5911
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavcodec/tta.c
  2. +1
    -1
      libavformat/matroskadec.c

+ 1
- 1
libavcodec/tta.c View File

@@ -129,7 +129,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)


s->avctx = avctx; s->avctx = avctx;


// 30bytes includes TTA1 header
// 22 bytes for a TTA1 header
if (avctx->extradata_size < 22) if (avctx->extradata_size < 22)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;




+ 1
- 1
libavformat/matroskadec.c View File

@@ -2558,7 +2558,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
} }
if (track->audio.out_samplerate < 0 || track->audio.out_samplerate > INT_MAX) if (track->audio.out_samplerate < 0 || track->audio.out_samplerate > INT_MAX)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
extradata_size = 30;
extradata_size = 22;
extradata = av_mallocz(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); extradata = av_mallocz(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!extradata) if (!extradata)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);


Loading…
Cancel
Save