generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adx: add an adx muxer

Browse Source
This commit is contained in:
Justin Ruggles 2011-12-19 11:10:34 -05:00
parent 754ebd1a5b
commit 779ef255e6
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -108,7 +108,7 @@ easier to use. The changes are:
- Discworld II BMV decoding support - Discworld II BMV decoding support
- VBLE Decoder - VBLE Decoder
- OS X Video Decoder Acceleration (VDA) support - OS X Video Decoder Acceleration (VDA) support
- CRI ADX audio format demuxer - CRI ADX audio format muxer and demuxer
- Playstation Portable PMP format demuxer - Playstation Portable PMP format demuxer
- PCM format support in OMA demuxer - PCM format support in OMA demuxer
- CLJR encoder - CLJR encoder

2
doc/general.texi
View File

@ -122,7 +122,7 @@ library:
@item Brute Force & Ignorance @tab @tab X @item Brute Force & Ignorance @tab @tab X
@tab Used in the game Flash Traffic: City of Angels. @tab Used in the game Flash Traffic: City of Angels.
@item BWF @tab X @tab X @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. @tab Audio-only format used in console video games.
@item Discworld II BMV @tab @tab X @item Discworld II BMV @tab @tab X
@item Interplay C93 @tab @tab X @item Interplay C93 @tab @tab X

1
libavformat/Makefile
View File

@ -22,6 +22,7 @@ OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o rawdec.o
OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o
OBJS-$(CONFIG_AC3_MUXER) += rawenc.o OBJS-$(CONFIG_AC3_MUXER) += rawenc.o
OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o
OBJS-$(CONFIG_ADX_MUXER) += rawenc.o
OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o
OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o riff.o pcm.o OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o riff.o pcm.o

2
libavformat/allformats.c
View File

@ -52,7 +52,7 @@ void av_register_all(void)
REGISTER_DEMUXER (AAC, aac); REGISTER_DEMUXER (AAC, aac);
REGISTER_MUXDEMUX (AC3, ac3); REGISTER_MUXDEMUX (AC3, ac3);
REGISTER_MUXER (ADTS, adts); REGISTER_MUXER (ADTS, adts);
REGISTER_DEMUXER (ADX, adx); REGISTER_MUXDEMUX (ADX, adx);
REGISTER_DEMUXER (AEA, aea); REGISTER_DEMUXER (AEA, aea);
REGISTER_MUXDEMUX (AIFF, aiff); REGISTER_MUXDEMUX (AIFF, aiff);
REGISTER_MUXDEMUX (AMR, amr); REGISTER_MUXDEMUX (AMR, amr);

12
libavformat/rawenc.c
View File

@ -45,6 +45,18 @@ AVOutputFormat ff_ac3_muxer = {
}; };
#endif #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 #if CONFIG_DIRAC_MUXER
AVOutputFormat ff_dirac_muxer = { AVOutputFormat ff_dirac_muxer = {
.name = "dirac", .name = "dirac",