Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-07 02:20:01 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-07 02:21:12 +0300
commitb480f0e37a4297f19ab9e2244a232ba9d5baf499 (patch)
tree2eb31cb8cebd2e5cc83eec895264dac35a7a3a1f /libavformat/caf.c
parente855ed17a722ef9787c1ea5761a6a86215519ebc (diff)
avformat/cafenc: Move special casing of PCM codecs into ff_codec_caf_tags
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/caf.c')
-rw-r--r--libavformat/caf.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/caf.c b/libavformat/caf.c
index c1ecc94425..00854615ca 100644
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
@@ -61,6 +61,18 @@ const AVCodecTag ff_codec_caf_tags[] = {
/*{ MPEG4CELP MKTAG('c','e','l','p') },*/
/*{ MPEG4HVXC MKTAG('h','v','x','c') },*/
/*{ MPEG4TwinVQ MKTAG('t','w','v','q') },*/
+
+ { AV_CODEC_ID_PCM_S8, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_S16LE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_S16BE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_S24LE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_S24BE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_S32LE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_S32BE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_F32LE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_F32BE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_F64LE, MKTAG('l','p','c','m') },
+ { AV_CODEC_ID_PCM_F64BE, MKTAG('l','p','c','m') },
{ AV_CODEC_ID_NONE, 0 },
};