Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-16lavf: Add WebM DASH Manifest MuxerVignesh Venkatasubramanian
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>
2014-07-08avformat/segment: Support cutting at clocktimeDeti fliegl
Signed-off-by: Deti fliegl <fliegl@baycom.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'Michael Niedermayer
* commit '49a242687cf44f86570b706db3c5912ff06bc6c2': doc: Document segment_list_type Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19doc: Document segment_list_typeLuca Barbato
2014-06-11Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'Michael Niedermayer
* 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>
2014-06-11Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'Michael Niedermayer
* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55': doc: Document mpegts muxrate Conflicts: doc/muxers.texi See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-11mpegts: Provide an option to override the pcr periodLuca Barbato
Certain hardware demuxer have specific restrictions for PCR periodicity.
2014-06-11doc: Document mpegts muxrateLuca Barbato
2014-06-03fix various typosLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03doc/muxers: Document problems of omitting nut syncpoints as well as alternativesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29avformat/nutenc: add mode that omits the indexMichael Niedermayer
When the index is not written, several data tables become unneeded, reducing memory and cpu requirements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'Michael Niedermayer
* 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>
2014-05-29nut: Support experimental NUT 4 featuresLuca Barbato
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>
2014-05-10Document smoothstreaming muxerAndrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'Michael Niedermayer
* 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>
2014-04-29Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'Michael Niedermayer
* 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>
2014-04-29hls: Add an option to prepend a baseurl to the playlist entriesLuca Barbato
Useful to generate playlists with absolute paths. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-29segment: Add an option to prepend a string to the list entriesEnrique Arizón Benito
Useful to generate lists with absolute urls. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-27Fix bistream typosMichael Niedermayer
Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27fix bistream typosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-07Fix spelling errors in texi files: accomodate -> accommodate allows to -> ↵Andreas Cadhalpun
allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'Michael Niedermayer
* commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd': doc: Name the MOV muxer as it should be called Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-19doc: Name the MOV muxer as it should be calledLuca Barbato
The section name is the muxer, not the format.
2014-02-19doc: Sort the muxer documentationLuca Barbato
Keep the sections alphabetically sorted.
2014-01-19doc/muxers: add "Options", "Examples", "Syntax", etc. subsectionsTimothy Gu
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>
2014-01-19doc/muxers/segment: fix formula for computing the segment_time_delta valueStefano Sabatini
2014-01-17Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'Michael Niedermayer
* 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>
2014-01-17Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'Michael Niedermayer
* 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>
2014-01-17mp3enc: allow omitting the id3v2 header with -id3v2_version 0Anton Khirnov
2014-01-17mp3enc: add an option for disabling the Xing frame.Anton Khirnov
2014-01-08doc/muxers/image2: apply several formatting changesStefano Sabatini
2014-01-08doc/muxers/image2: document strftime optionRamiro Polla
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-01-08doc/muxers/matroska: add information to the matroska metadata language entryHelmut K. C. Tessarek
2014-01-08doc/muxers/matroska: reformat documentationStefano Sabatini
2014-01-02doc/muxers/hls: change "can used" to "can be used"Stefano Sabatini
Spotted-by: Alexander Strasser <eclipse7@gmx.net>
2014-01-02doc/muxers/segment: clarify ambiguos referenceStefano Sabatini
Replace "The segmenter muxer" with "This muxer". The "segmenter muxer" was never defined before, and thus it is a slightly ambiguous term.
2014-01-02doc/muxers/segment: reference hls muxerStefano Sabatini
2014-01-02doc/muxers/hls: extend documentationStefano Sabatini
In particular, reference segment muxer and clarify difference between segment filename number and playlist sequence number. Should fix trac ticket #2601.
2013-12-15doc/muxers/tee: add example showing second level escapingStefano Sabatini
2013-12-15doc/muxers/tee: use @ref to reference other sectionsStefano Sabatini
2013-11-25lavf/segment: add segment_list_entry_prefix optionStefano Sabatini
This option allows to add a prefix to the segment list entry filenames. Also set by default the list entry filenames to the corresponding segment basename, consistent with the HLS muxer. Based on an idea by Steven Liu <lingjiujianke@gmail.com>.
2013-11-20doc/muxers/segment: remove wrong default indication for segment_list_flags ↵Stefano Sabatini
option
2013-11-07doc/muxers: document animated GIF muxer.Clément Bœsch
2013-10-29doc/muxers: add definitory line for the MOV/MP4/ISMV muxerStefano Sabatini
Also rename section name, to match the other ones adopting the muxer name (rather than the related upcased standard name).
2013-09-19doc/muxers: itemize tee examplesStefano Sabatini
Improve rendering.
2013-08-22lavf/image2: extend start_number range to accept zeroStefano Sabatini
Address trac ticket #2884.
2013-08-22Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'Michael Niedermayer
* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b': movenc: add faststart option for web streaming Conflicts: doc/muxers.texi libavformat/movenc.c libavformat/movenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21doc/muxers: add elaborated example for the tee muxerStefano Sabatini
The example shows how to combine bsfs and select options.
2013-08-21lavf/tee: add special select optionStefano Sabatini
2013-08-21movenc: add faststart option for web streamingClément Bœsch
Faststart moves the moov atom to the beginning of the file and rewrites the rest of the file after muxing is complete. Signed-off-by: Martin Storsjö <martin@martin.st>