summaryrefslogtreecommitdiff
path: root/doc/muxers.texi
Commit message (Collapse)AuthorAge
* Merge commit '55f03d872640175a00bfa262da4652b7312b905f'Michael Niedermayer2014-10-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '55f03d872640175a00bfa262da4652b7312b905f': hlsenc: Add parameter -hls_allow_cache Conflicts: doc/muxers.texi libavformat/hlsenc.c libavformat/version.h See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: Add parameter -hls_allow_cacheJoakim Roubert2014-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | The -hls_allow_cache parameter enables explicitly setting the EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates whether the client MAY or MUST NOT cache downloaded media segments for later replay. Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE will not show in the manifest for other values (or if -hls_allow_cache is not used. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/hlsenc: Added parameter -hls_allow_cacheJoakim Roubert2014-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | The -hls_allow_cache parameter enables explicitly setting the EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates whether the client MAY or MUST NOT cache downloaded media segments for later replay. Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE will not show in the manifest for other values (or if -hls_allow_cache is not used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/hls: add hls_ts_optionSteven Liu2014-09-16
| | | | | | | | | | | | Same as COMMITID 4f5493fe2380ad4aba67759baa7d7d4437f2e776. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | hlsenc: single_file, support HLS ver 4 byterangesMika Raento2014-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new option -hls_flags single_file that creates one .ts file for HLS and adds byteranges to the .m3u8 file, instead of creating one .ts file for each segment. This is helpful at least for storing large number of videos, as the number of files per video is drastically reduced and copying and storing those files takes less requests and inodes. This is based on work by Nicolas Martyanoff, discussed on ffmpeg-devel in July 2014. That patch seems abandoned by the author, and contained unrelated changes. This patch tries to add the minimum amount of code to support the byterange playlists. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/muxers/segment: reword text for examples, improve consistencyStefano Sabatini2014-09-07
| |
* | lavf/segment: add segment_format_options optionStefano Sabatini2014-09-07
| |
* | doc/muxers: document which applications are known to need disable_chpl.Michael Niedermayer2014-08-06
| | | | | | | | | | Thanks to: John Stebbins <stebbins@jetheaddev.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'Michael Niedermayer2014-08-05
|\| | | | | | | | | | | | | | | | | | | * commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c': movenc: Add option to disable nero chapters Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add option to disable nero chaptersJohn Stebbins2014-08-05
| | | | | | | | | | | | | | And add flag to muxer documentation. Nero chapters break some taggers (mp3tag and iTunes). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | libavformat/segment: change segment_list_size behavior to match ↵Simon Thelen2014-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hls_list_size behavior. Make the segment muxer keep segment_list_size segments instead of segment_list_size + 1 segments. This patch also changes the documentation for segment_list_size to reduce possible confusion over how many segments are kept. this allows the segment list to be limited to containing only one segment which used to be impossible because a segment_list_size of 0 kept all the segments and a segment_list_size of 1 kept 2 segments. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Add WebM DASH Manifest MuxerVignesh Venkatasubramanian2014-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the ability to generate WebM DASH manifest XML using ffmpeg. A sample command line would be as follows: ffmpeg \ -f webm_dash_manifest -i video1.webm \ -f webm_dash_manifest -i video2.webm \ -f webm_dash_manifest -i audio1.webm \ -f webm_dash_manifest -i audio2.webm \ -map 0 -map 1 -map 2 -map 3 \ -c copy \ -f webm_dash_manifest \ -adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \ manifest.xml It works by exporting necessary fields as metadata tags in matroskadec and use those values to write the appropriate XML fields as per the WebM DASH Specification [1]. Some ideas are adopted from webm-tools project [2]. [1] https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification [2] https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/ Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Support cutting at clocktimeDeti fliegl2014-07-07
| | | | | | | | | | Signed-off-by: Deti fliegl <fliegl@baycom.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | * commit '49a242687cf44f86570b706db3c5912ff06bc6c2': doc: Document segment_list_type Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Document segment_list_typeLuca Barbato2014-06-18
| |
* | Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'Michael Niedermayer2014-06-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd': mpegts: Provide an option to override the pcr period Conflicts: doc/muxers.texi libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Provide an option to override the pcr periodLuca Barbato2014-06-10
| | | | | | | | Certain hardware demuxer have specific restrictions for PCR periodicity.
* | Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'Michael Niedermayer2014-06-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a736ae1e96b8718af0962106aa40df5f4b246b55': doc: Document mpegts muxrate Conflicts: doc/muxers.texi See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Document mpegts muxrateLuca Barbato2014-06-10
| |
* | fix various typosLou Logan2014-06-03
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/muxers: Document problems of omitting nut syncpoints as well as alternativesMichael Niedermayer2014-06-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: add mode that omits the indexMichael Niedermayer2014-05-29
| | | | | | | | | | | | | | When the index is not written, several data tables become unneeded, reducing memory and cpu requirements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c94e2e85cb6af8a570d8542a830556243bd32873': nut: Support experimental NUT 4 features Conflicts: doc/nut.texi libavformat/nut.h libavformat/nutdec.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Support experimental NUT 4 featuresLuca Barbato2014-05-28
| | | | | | | | | | | | | | Add the low overhead pipe mode and the extended broadcast mode. Export the options as 'syncponts' since it impacts only that. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Document smoothstreaming muxerAndrey Utkin2014-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'Michael Niedermayer2014-04-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '5a70a783f04919514efec7751d710b64d8975fd7': hls: Add an option to prepend a baseurl to the playlist entries Conflicts: doc/muxers.texi libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Add an option to prepend a baseurl to the playlist entriesLuca Barbato2014-04-29
| | | | | | | | | | | | Useful to generate playlists with absolute paths. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'Michael Niedermayer2014-04-29
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f': segment: Add an option to prepend a string to the list entries Conflicts: doc/muxers.texi libavformat/segment.c See: 5e278c19c752d65fdc1da1ceb599b091f71a4b4b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add an option to prepend a string to the list entriesEnrique Arizón Benito2014-04-29
| | | | | | | | | | | | Useful to generate lists with absolute urls. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Fix bistream typosMichael Niedermayer2014-04-27
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix bistream typosMichael Niedermayer2014-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix spelling errors in texi files: accomodate -> accommodate allows to -> ↵Andreas Cadhalpun2014-03-06
| | | | | | | | | | | | allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'Michael Niedermayer2014-02-19
|\| | | | | | | | | | | | | | | | | | | * commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd': doc: Name the MOV muxer as it should be called Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Name the MOV muxer as it should be calledLuca Barbato2014-02-19
| | | | | | | | The section name is the muxer, not the format.
| * doc: Sort the muxer documentationLuca Barbato2014-02-19
| | | | | | | | Keep the sections alphabetically sorted.
* | doc/muxers: add "Options", "Examples", "Syntax", etc. subsectionsTimothy Gu2014-01-19
| | | | | | | | | | | | | | More consistent with codec docs. Also some minor reorganization of sentences to fit the new document hierarchy. Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* | doc/muxers/segment: fix formula for computing the segment_time_delta valueStefano Sabatini2014-01-19
| |
* | Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'Michael Niedermayer2014-01-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '33018907bd07b34e0e70d5ae12097265eb3734d7': mp3enc: allow omitting the id3v2 header with -id3v2_version 0 Conflicts: doc/muxers.texi libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: allow omitting the id3v2 header with -id3v2_version 0Anton Khirnov2014-01-17
| |
* | Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'Michael Niedermayer2014-01-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd': mp3enc: add an option for disabling the Xing frame. Conflicts: doc/muxers.texi libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: add an option for disabling the Xing frame.Anton Khirnov2014-01-17
| |
* | doc/muxers/image2: apply several formatting changesStefano Sabatini2014-01-08
| |
* | doc/muxers/image2: document strftime optionRamiro Polla2014-01-08
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc/muxers/matroska: add information to the matroska metadata language entryHelmut K. C. Tessarek2014-01-08
| |
* | doc/muxers/matroska: reformat documentationStefano Sabatini2014-01-08
| |
* | doc/muxers/hls: change "can used" to "can be used"Stefano Sabatini2014-01-02
| | | | | | | | Spotted-by: Alexander Strasser <eclipse7@gmx.net>
* | doc/muxers/segment: clarify ambiguos referenceStefano Sabatini2014-01-02
| | | | | | | | | | Replace "The segmenter muxer" with "This muxer". The "segmenter muxer" was never defined before, and thus it is a slightly ambiguous term.
* | doc/muxers/segment: reference hls muxerStefano Sabatini2014-01-02
| |
* | doc/muxers/hls: extend documentationStefano Sabatini2014-01-02
| | | | | | | | | | | | | | In particular, reference segment muxer and clarify difference between segment filename number and playlist sequence number. Should fix trac ticket #2601.
* | doc/muxers/tee: add example showing second level escapingStefano Sabatini2013-12-15
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 11:55:29 +0000