summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorCameron Cawley <ccawley2011@gmail.com>2018-10-13 00:06:39 +0100
committerPaul B Mahol <onemda@gmail.com>2018-10-26 13:39:25 +0200
commit22238d0b9440cf55aafda42c60f4413514d4aeb8 (patch)
treea406f18615ac7d99c232d797e229c5f3a9e7417b /libavformat
parentfb7925ba2fa10e1ecf63eb4bada268e25627a88d (diff)
avcodec: Implement Archimedes VIDC encoder/decoder
Signed-off-by: Cameron Cawley <ccawley2011@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile2
-rw-r--r--libavformat/allformats.c2
-rw-r--r--libavformat/pcmdec.c3
-rw-r--r--libavformat/pcmenc.c3
4 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e99e9150d5..e4d997c4a0 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -411,6 +411,8 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += pcmdec.o pcm.o
OBJS-$(CONFIG_PCM_U32LE_MUXER) += pcmenc.o rawenc.o
OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o
OBJS-$(CONFIG_PCM_U8_MUXER) += pcmenc.o rawenc.o
+OBJS-$(CONFIG_PCM_VIDC_DEMUXER) += pcmdec.o pcm.o
+OBJS-$(CONFIG_PCM_VIDC_MUXER) += pcmenc.o rawenc.o
OBJS-$(CONFIG_PJS_DEMUXER) += pjsdec.o subtitles.o
OBJS-$(CONFIG_PMP_DEMUXER) += pmpdec.o
OBJS-$(CONFIG_PVA_DEMUXER) += pva.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 9e41718685..498077e1de 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -289,6 +289,8 @@ extern AVInputFormat ff_pcm_alaw_demuxer;
extern AVOutputFormat ff_pcm_alaw_muxer;
extern AVInputFormat ff_pcm_mulaw_demuxer;
extern AVOutputFormat ff_pcm_mulaw_muxer;
+extern AVInputFormat ff_pcm_vidc_demuxer;
+extern AVOutputFormat ff_pcm_vidc_muxer;
extern AVInputFormat ff_pcm_f64be_demuxer;
extern AVOutputFormat ff_pcm_f64be_muxer;
extern AVInputFormat ff_pcm_f64le_demuxer;
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index d0ceea6fa9..bd2a0384f8 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -177,6 +177,9 @@ PCMDEF(alaw, "PCM A-law",
PCMDEF(mulaw, "PCM mu-law",
"ul", AV_CODEC_ID_PCM_MULAW)
+PCMDEF(vidc, "PCM Archimedes VIDC",
+ NULL, AV_CODEC_ID_PCM_VIDC)
+
static const AVOption sln_options[] = {
{ "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 8000}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c
index 3e4f308057..1760b3bef7 100644
--- a/libavformat/pcmenc.c
+++ b/libavformat/pcmenc.c
@@ -92,3 +92,6 @@ PCMDEF(alaw, "PCM A-law",
PCMDEF(mulaw, "PCM mu-law",
"ul", AV_CODEC_ID_PCM_MULAW)
+
+PCMDEF(vidc, "PCM Archimedes VIDC",
+ NULL, AV_CODEC_ID_PCM_VIDC)