ffmpeg | branch: master | Gyan Doshi <ffm...@gyani.pro> | Sun Jan 26 20:50:18 2020 +0530| [cfd9a6590365e1b5f4a43387555e5747d3990d31] | committer: Gyan Doshi
doc/demuxers: update mov section Add details and all options for mov.c demuxer. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfd9a6590365e1b5f4a43387555e5747d3990d31 --- doc/demuxers.texi | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- doc/muxers.texi | 7 ------ 2 files changed, 70 insertions(+), 10 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 2de14b68d3..3c15ab9eee 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -604,9 +604,13 @@ Set the sample rate for libopenmpt to output. Range is from 1000 to INT_MAX. The value default is 48000. @end table -@section mov/mp4/3gp/QuickTime +@section mov/mp4/3gp -QuickTime / MP4 demuxer. +Demuxer for Quicktime File Format & ISO/IEC Base Media File Format (ISO/IEC 14496-12 or MPEG-4 Part 12, ISO/IEC 15444-12 or JPEG 2000 Part 12). + +Registered extensions: mov, mp4, m4a, 3gp, 3g2, mj2, psp, m4b, ism, ismv, isma, f4v + +@subsection Options This demuxer accepts the following options: @table @option @@ -617,10 +621,73 @@ Enabling this can theoretically leak information in some use cases. @item use_absolute_path Allows loading of external tracks via absolute paths, disabled by default. Enabling this poses a security risk. It should only be enabled if the source -is known to be non malicious. +is known to be non-malicious. + +@item seek_streams_individually +When seeking, identify the closest point in each stream individually and demux packets in +that stream from identified point. This can lead to a different sequence of packets compared +to demuxing linearly from the beginning. Default is true. + +@item ignore_editlist +Ignore any edit list atoms. The demuxer, by default, modifies the stream index to reflect the +timeline described by the edit list. Default is false. + +@item advanced_editlist +Modify the stream index to reflect the timeline described by the edit list. @code{ignore_editlist} +must be set to false for this option to be effective. +If both @code{ignore_editlist} and this option are set to false, then only the +start of the stream index is modified to reflect initial dwell time or starting timestamp +described by the edit list. Default is true. + +@item ignore_chapters +Don't parse chapters. This includes GoPro 'HiLight' tags/moments. Note that chapters are +only parsed when input is seekable. Default is false. + +@item use_mfra_for +For seekable fragmented input, set fragment's starting timestamp from media fragment random access box, if present. + +Following options are available: +@table @samp +@item auto +Auto-detect whether to set mfra timestamps as PTS or DTS @emph{(default)} + +@item dts +Set mfra timestamps as DTS + +@item pts +Set mfra timestamps as PTS +@item 0 +Don't use mfra box to set timestamps @end table +@item export_all +Export unrecognized boxes within the @var{udta} box as metadata entries. The first four +characters of the box type are set as the key. Default is false. + +@item export_xmp +Export entire contents of @var{XMP_} box and @var{uuid} box as a string with key @code{xmp}. Note that +if @code{export_all} is set and this option isn't, the contents of @var{XMP_} box are still exported +but with key @code{XMP_}. Default is false. + +@item activation_bytes +4-byte key required to decrypt Audible AAX and AAX+ files. See Audible AAX subsection below. + +@item audible_fixed_key +Fixed key used for handling Audible AAX/AAX+ files. It has been pre-set so should not be necessary to +specify. + +@item decryption_key +16-byte key, in hex, to decrypt files encrypted using ISO Common Encryption (CENC/AES-128 CTR; ISO/IEC 23001-7). +@end table + +@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 mpegts MPEG-2 transport stream demuxer. diff --git a/doc/muxers.texi b/doc/muxers.texi index 72b8b54cb1..d304181671 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1506,13 +1506,6 @@ 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: _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
