summaryrefslogtreecommitdiff
path: root/libavformat/caf.c
diff options
context:
space:
mode:
authorMartijn van Beurden <mvanb1@gmail.com>2022-06-11 09:31:12 +0200
committerPaul B Mahol <onemda@gmail.com>2022-07-05 14:11:20 +0200
commit056a9fac5b8fef3b9f5abeb5bf581a3e52e28a37 (patch)
tree88fc80727b21b15c9f8d7c09a59913b39380d848 /libavformat/caf.c
parentaa8905a1b13c6ac206d532afbad953dc71319247 (diff)
downloadffmpeg-056a9fac5b8fef3b9f5abeb5bf581a3e52e28a37.tar.gz
avformat/cafdec: Implement FLAC-in-CAF parsing
The afconvert utility shipped with MacOS supports muxing of FLAC in CAF, see afconvert help output on a recent Mac here: https://hydrogenaud.io/index.php?topic=122509.0 A file created with afconvert free of copyright (licensed CC0) can be found here: http://www.audiograaf.nl/misc_stuff/afconvert-FLAC-in-CAF.caf
Diffstat (limited to 'libavformat/caf.c')
-rw-r--r--libavformat/caf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/caf.c b/libavformat/caf.c
index a700e4055b..a61c39fae5 100644
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
@@ -46,6 +46,7 @@ const AVCodecTag ff_codec_caf_tags[] = {
{ AV_CODEC_ID_GSM, MKTAG('a','g','s','m') },
{ AV_CODEC_ID_GSM_MS, MKTAG('m','s', 0, '1') },
{ AV_CODEC_ID_ILBC, MKTAG('i','l','b','c') },
+ { AV_CODEC_ID_FLAC, MKTAG('f','l','a','c') },
{ AV_CODEC_ID_MACE3, MKTAG('M','A','C','3') },
{ AV_CODEC_ID_MACE6, MKTAG('M','A','C','6') },
{ AV_CODEC_ID_MP1, MKTAG('.','m','p','1') },