diff options
| author | Peter Ross <pross@xvid.org> | 2024-12-19 22:57:04 +1100 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2025-06-23 17:19:18 +1000 |
| commit | dee4edfa63dd3f19f2733a353af7296151b0b381 (patch) | |
| tree | 37329bd96db41910e7b74ece106dbbd11cc6e443 | |
| parent | 52f62468aa1b7a63304524c3aca3e3c0e75ec8d0 (diff) | |
| download | ffmpeg-dee4edfa63dd3f19f2733a353af7296151b0b381.tar.gz | |
avformat/riff: G.728 muxing and demuxing
| -rw-r--r-- | libavformat/riff.c | 2 | ||||
| -rw-r--r-- | libavformat/riffenc.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 017a0658ef..151563e9f2 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -555,6 +555,7 @@ const AVCodecTag ff_codec_wav_tags[] = { { AV_CODEC_ID_ADPCM_G726, 0x0045 }, { AV_CODEC_ID_ADPCM_G726, 0x0014 }, /* g723 Antex */ { AV_CODEC_ID_ADPCM_G726, 0x0040 }, /* g721 Antex */ + { AV_CODEC_ID_G728, 0x0041 }, { AV_CODEC_ID_MP2, 0x0050 }, { AV_CODEC_ID_MP3, 0x0055 }, { AV_CODEC_ID_AMR_NB, 0x0057 }, @@ -611,6 +612,7 @@ const AVCodecTag ff_codec_wav_tags[] = { { AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */ { AV_CODEC_ID_AAC, 0xA106 }, { AV_CODEC_ID_SPEEX, 0xA109 }, + { AV_CODEC_ID_G728, 0xCD02 }, { AV_CODEC_ID_FLAC, 0xF1AC }, /* DFPWM does not have an assigned format tag; it uses a GUID in WAVEFORMATEX instead */ { AV_CODEC_ID_DFPWM, 0xFFFE }, diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 59c9932c36..df98b3b117 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -92,6 +92,7 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, avio_wl32(pb, par->sample_rate); if (par->codec_id == AV_CODEC_ID_ATRAC3 || par->codec_id == AV_CODEC_ID_G723_1 || + par->codec_id == AV_CODEC_ID_G728 || par->codec_id == AV_CODEC_ID_MP2 || par->codec_id == AV_CODEC_ID_MP3 || par->codec_id == AV_CODEC_ID_GSM_MS) { |