diff options
author | Vesselin Bontchev <vesselin.bontchev@yandex.com> | 2015-07-11 18:02:47 +0000 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 20:28:39 +0200 |
commit | 0a551cbe97e01e8b6426560bbdda2c28f22f0fb9 (patch) | |
tree | b25c5b8ad174dc2611b8b7ca5504ecad5c005cb2 /doc | |
parent | 4df66c7cd6f77e9b3a2cc1aee092068087d3853d (diff) | |
download | ffmpeg-0a551cbe97e01e8b6426560bbdda2c28f22f0fb9.tar.gz |
Add support for Audible AAX (and AAX+) files
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/general.texi | 2 | ||||
-rw-r--r-- | doc/muxers.texi | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index dc22d90257..617be66dcc 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -226,6 +226,8 @@ library: @item 4xm @tab @tab X @tab 4X Technologies format, used in some games. @item 8088flex TMV @tab @tab X +@item AAX @tab @tab X + @tab Audible Enhanced Audio format, used in audiobooks. @item ACT Voice @tab @tab X @tab contains G.729 audio @item Adobe Filmstrip @tab X @tab X diff --git a/doc/muxers.texi b/doc/muxers.texi index 8e3eb4ba7e..ccd222c916 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -667,6 +667,13 @@ point on IIS with this muxer. Example: ffmpeg -re @var{<normal input/transcoding options>} -movflags isml+frag_keyframe -f ismv http://server/publishingpoint.isml/Streams(Encoder1) @end example +@subsection Audible AAX + +Audible AAX files are encrypted M4B files, and they can be decrypted by specifying a 4 byte activation secret. +@example +ffmpeg -activation_bytes 1CEB00DA -i test.aax -vn -c:a copy output.mp4 +@end example + @section mp3 The MP3 muxer writes a raw MP3 stream with the following optional features: |