Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
779ef255
Commit
779ef255
authored
Dec 19, 2011
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adx: add an adx muxer
parent
754ebd1a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
Changelog
Changelog
+1
-1
general.texi
doc/general.texi
+1
-1
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-1
rawenc.c
libavformat/rawenc.c
+12
-0
No files found.
Changelog
View file @
779ef255
...
...
@@ -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
...
...
doc/general.texi
View file @
779ef255
...
...
@@ -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
...
...
libavformat/Makefile
View file @
779ef255
...
...
@@ -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
...
...
libavformat/allformats.c
View file @
779ef255
...
...
@@ -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
);
...
...
libavformat/rawenc.c
View file @
779ef255
...
...
@@ -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"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment