Hook up the MD studio demuxer and Atrac1 decoder.
Originally committed as revision 19969 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e704b012f2
commit
61dc238b45
@ -38,6 +38,8 @@ version <next>:
|
|||||||
- LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
|
- LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
|
||||||
- Wmapro decoder
|
- Wmapro decoder
|
||||||
- Core Audio Format demuxer
|
- Core Audio Format demuxer
|
||||||
|
- Atrac1 decoder
|
||||||
|
- MD STUDIO audio demuxer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -107,6 +107,7 @@ library:
|
|||||||
@item Matroska audio @tab X @tab
|
@item Matroska audio @tab X @tab
|
||||||
@item MAXIS XA @tab @tab X
|
@item MAXIS XA @tab @tab X
|
||||||
@tab Used in Sim City 3000; file extension .xa.
|
@tab Used in Sim City 3000; file extension .xa.
|
||||||
|
@item MD Studio @tab @tab X
|
||||||
@item Monkey's Audio @tab @tab X
|
@item Monkey's Audio @tab @tab X
|
||||||
@item Motion Pixels MVI @tab @tab X
|
@item Motion Pixels MVI @tab @tab X
|
||||||
@item MOV/QuickTime/MP4 @tab X @tab X
|
@item MOV/QuickTime/MP4 @tab X @tab X
|
||||||
@ -532,6 +533,7 @@ following image formats are supported:
|
|||||||
@tab decoding supported through external library libopencore-amrwb
|
@tab decoding supported through external library libopencore-amrwb
|
||||||
@item Apple lossless audio @tab X @tab X
|
@item Apple lossless audio @tab X @tab X
|
||||||
@tab QuickTime fourcc 'alac'
|
@tab QuickTime fourcc 'alac'
|
||||||
|
@item Atrac 1 @tab @tab X
|
||||||
@item Atrac 3 @tab @tab X
|
@item Atrac 3 @tab @tab X
|
||||||
@item Delphine Software International CIN audio @tab @tab X
|
@item Delphine Software International CIN audio @tab @tab X
|
||||||
@tab Codec used in Delphine Software International games.
|
@tab Codec used in Delphine Software International games.
|
||||||
|
@ -48,6 +48,7 @@ OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o
|
|||||||
OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o
|
OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o
|
||||||
OBJS-$(CONFIG_ASV2_DECODER) += asv1.o mpeg12data.o
|
OBJS-$(CONFIG_ASV2_DECODER) += asv1.o mpeg12data.o
|
||||||
OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o mpeg12data.o
|
OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o mpeg12data.o
|
||||||
|
OBJS-$(CONFIG_ATRAC1_DECODER) += atrac1.o atrac.o
|
||||||
OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o atrac.o
|
OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o atrac.o
|
||||||
OBJS-$(CONFIG_AVS_DECODER) += avs.o
|
OBJS-$(CONFIG_AVS_DECODER) += avs.o
|
||||||
OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o
|
OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o
|
||||||
|
@ -199,6 +199,7 @@ void avcodec_register_all(void)
|
|||||||
REGISTER_ENCDEC (AC3, ac3);
|
REGISTER_ENCDEC (AC3, ac3);
|
||||||
REGISTER_ENCDEC (ALAC, alac);
|
REGISTER_ENCDEC (ALAC, alac);
|
||||||
REGISTER_DECODER (APE, ape);
|
REGISTER_DECODER (APE, ape);
|
||||||
|
REGISTER_DECODER (ATRAC1, atrac1);
|
||||||
REGISTER_DECODER (ATRAC3, atrac3);
|
REGISTER_DECODER (ATRAC3, atrac3);
|
||||||
REGISTER_DECODER (COOK, cook);
|
REGISTER_DECODER (COOK, cook);
|
||||||
REGISTER_DECODER (DCA, dca);
|
REGISTER_DECODER (DCA, dca);
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_MAJOR 52
|
#define LIBAVCODEC_VERSION_MAJOR 52
|
||||||
#define LIBAVCODEC_VERSION_MINOR 35
|
#define LIBAVCODEC_VERSION_MINOR 36
|
||||||
#define LIBAVCODEC_VERSION_MICRO 0
|
#define LIBAVCODEC_VERSION_MICRO 0
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||||
|
@ -12,6 +12,7 @@ OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o
|
|||||||
OBJS-$(CONFIG_AC3_DEMUXER) += raw.o
|
OBJS-$(CONFIG_AC3_DEMUXER) += raw.o
|
||||||
OBJS-$(CONFIG_AC3_MUXER) += raw.o
|
OBJS-$(CONFIG_AC3_MUXER) += raw.o
|
||||||
OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
|
OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
|
||||||
|
OBJS-$(CONFIG_AEA_DEMUXER) += aea.o
|
||||||
OBJS-$(CONFIG_AIFF_DEMUXER) += aiff.o riff.o raw.o
|
OBJS-$(CONFIG_AIFF_DEMUXER) += aiff.o riff.o raw.o
|
||||||
OBJS-$(CONFIG_AIFF_MUXER) += aiff.o riff.o
|
OBJS-$(CONFIG_AIFF_MUXER) += aiff.o riff.o
|
||||||
OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
|
OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
|
||||||
|
@ -50,6 +50,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 (AEA, aea);
|
||||||
REGISTER_MUXDEMUX (AIFF, aiff);
|
REGISTER_MUXDEMUX (AIFF, aiff);
|
||||||
REGISTER_MUXDEMUX (AMR, amr);
|
REGISTER_MUXDEMUX (AMR, amr);
|
||||||
REGISTER_DEMUXER (APC, apc);
|
REGISTER_DEMUXER (APC, apc);
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#define AVFORMAT_AVFORMAT_H
|
#define AVFORMAT_AVFORMAT_H
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 52
|
#define LIBAVFORMAT_VERSION_MAJOR 52
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 38
|
#define LIBAVFORMAT_VERSION_MINOR 39
|
||||||
#define LIBAVFORMAT_VERSION_MICRO 0
|
#define LIBAVFORMAT_VERSION_MICRO 0
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
|
Loading…
Reference in New Issue
Block a user