diff options
| author | Justin Ruggles | 2011-12-19 11:10:34 -0500 |
|---|---|---|
| committer | Justin Ruggles | 2012-01-03 18:47:42 -0500 |
| commit | 779ef255e67162a125841716fd1e81c21feee359 (patch) | |
| tree | 581c2f0b23a6894d8dec0c4d21c94b50535156ab | |
| parent | 754ebd1a5b68dd63ccceb50a8a852fe8d0c94354 (diff) | |
adx: add an adx muxer
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/rawenc.c | 12 |
5 files changed, 16 insertions, 3 deletions
@@ -108,7 +108,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 8eaa97b17a..65d65bb26b 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 de440506ab..8c8a36d206 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 1debddbfc4..523b113205 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 5f2065e639..6e9f4b78ec 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", |