---
Changelog | 2 +-
doc/general.texi | 2 +-
libavformat/Makefile | 1 +
libavformat/allformats.c | 2 +-
libavformat/rawenc.c | 12 ++++++++++++
libavformat/version.h | 2 +-
6 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Changelog b/Changelog
index 5f5154a..e45ce50 100644
--- a/Changelog
+++ b/Changelog
@@ -102,7 +102,7 @@ easier to use. The changes are:
- Discworld II BMV decoding support
- VBLE Decoder
- OS X Video Decoder Acceleration (VDA) support
-- CRI ADX audio format demuxer
+- CRI ADX audio format muxer and demuxer
- Playstation Portable PMP format demuxer
- PCM format support in OMA demuxer
- CLJR encoder
diff --git a/doc/general.texi b/doc/general.texi
index 74f3cb6..e7ff1a8 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -122,7 +122,7 @@ library:
@item Brute Force & Ignorance @tab @tab X
@tab Used in the game Flash Traffic: City of Angels.
@item BWF @tab X @tab X
-@item CRI ADX @tab @tab X
+@item CRI ADX @tab X @tab X
@tab Audio-only format used in console video games.
@item Discworld II BMV @tab @tab X
@item Interplay C93 @tab @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ff6140b..d72c3d2 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -22,6 +22,7 @@ OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o rawdec.o
OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o
OBJS-$(CONFIG_AC3_MUXER) += rawenc.o
OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o
+OBJS-$(CONFIG_ADX_MUXER) += rawenc.o
OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o
OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o riff.o pcm.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index c75f1ba..5f45c61 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -52,7 +52,7 @@ void av_register_all(void)
REGISTER_DEMUXER (AAC, aac);
REGISTER_MUXDEMUX (AC3, ac3);
REGISTER_MUXER (ADTS, adts);
- REGISTER_DEMUXER (ADX, adx);
+ REGISTER_MUXDEMUX (ADX, adx);
REGISTER_DEMUXER (AEA, aea);
REGISTER_MUXDEMUX (AIFF, aiff);
REGISTER_MUXDEMUX (AMR, amr);
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 5f2065e..6e9f4b7 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -45,6 +45,18 @@ AVOutputFormat ff_ac3_muxer = {
};
#endif
+#if CONFIG_ADX_MUXER
+AVOutputFormat ff_adx_muxer = {
+ .name = "adx",
+ .long_name = NULL_IF_CONFIG_SMALL("CRI ADX"),
+ .extensions = "adx",
+ .audio_codec = CODEC_ID_ADPCM_ADX,
+ .video_codec = CODEC_ID_NONE,
+ .write_packet = ff_raw_write_packet,
+ .flags = AVFMT_NOTIMESTAMPS,
+};
+#endif
+
#if CONFIG_DIRAC_MUXER
AVOutputFormat ff_dirac_muxer = {
.name = "dirac",
diff --git a/libavformat/version.h b/libavformat/version.h
index a841701..e113a24 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 53
-#define LIBAVFORMAT_VERSION_MINOR 18
+#define LIBAVFORMAT_VERSION_MINOR 19
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
