diff options
| author | Paul B Mahol <onemda@gmail.com> | 2022-08-30 17:14:46 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2022-09-24 14:03:59 +0200 |
| commit | a166b8a19bb34afc2c6727f20f551fce9a53d6fe (patch) | |
| tree | 98ba651f57251a0f07d9d02d881f15bad47d954f /libavformat | |
| parent | 2f9fa7e3e9e85c736e6ba87192ec8f32bdf069a7 (diff) | |
| download | ffmpeg-a166b8a19bb34afc2c6727f20f551fce9a53d6fe.tar.gz | |
avcodec: add FTR audio decoder and parser
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 910a4e8792..7a3fad6392 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -923,6 +923,7 @@ static int avi_read_header(AVFormatContext *s) ast->dshow_block_align = 0; } if ((st->codecpar->codec_id == AV_CODEC_ID_AAC || + st->codecpar->codec_id == AV_CODEC_ID_FTR || st->codecpar->codec_id == AV_CODEC_ID_FLAC || st->codecpar->codec_id == AV_CODEC_ID_MP2 ) && ast->dshow_block_align <= 4 && ast->dshow_block_align) { av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align); diff --git a/libavformat/riff.c b/libavformat/riff.c index 5114114364..0d3f322545 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -558,6 +558,7 @@ const AVCodecTag ff_codec_wav_tags[] = { { AV_CODEC_ID_WMALOSSLESS, 0x0163 }, { AV_CODEC_ID_XMA1, 0x0165 }, { AV_CODEC_ID_XMA2, 0x0166 }, + { AV_CODEC_ID_FTR, 0x0180 }, { AV_CODEC_ID_ADPCM_CT, 0x0200 }, { AV_CODEC_ID_DVAUDIO, 0x0215 }, { AV_CODEC_ID_DVAUDIO, 0x0216 }, @@ -584,8 +585,10 @@ const AVCodecTag ff_codec_wav_tags[] = { { AV_CODEC_ID_PCM_MULAW, 0x6c75 }, { AV_CODEC_ID_AAC, 0x706d }, { AV_CODEC_ID_AAC, 0x4143 }, + { AV_CODEC_ID_FTR, 0x4180 }, { AV_CODEC_ID_XAN_DPCM, 0x594a }, { AV_CODEC_ID_G729, 0x729A }, + { AV_CODEC_ID_FTR, 0x8180 }, { AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */ { AV_CODEC_ID_AAC, 0xA106 }, { AV_CODEC_ID_SPEEX, 0xA109 }, |