Michael Niedermayer
ac26d7ea9d
Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'
...
* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
doc: Document mpegts muxrate
Conflicts:
doc/muxers.texi
See: 5b76c3a120
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 23:25:46 +02:00
Luca Barbato
f121dbd9f7
mpegts: Provide an option to override the pcr period
...
Certain hardware demuxer have specific restrictions for PCR periodicity.
2014-06-10 22:05:44 +02:00
Luca Barbato
a736ae1e96
doc: Document mpegts muxrate
2014-06-10 22:05:44 +02:00
Lou Logan
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
Michael Niedermayer
8d4d12a490
doc/muxers: Document problems of omitting nut syncpoints as well as alternatives
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 18:42:22 +02:00
Michael Niedermayer
82beb46e65
avformat/nutenc: add mode that omits the index
...
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-29 03:37:37 +02:00
Michael Niedermayer
a8499cbbe8
Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'
...
* 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-29 01:13:59 +02:00
Luca Barbato
c94e2e85cb
nut: Support experimental NUT 4 features
...
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-28 22:04:56 +02:00
Andrey Utkin
8cc6e91f69
Document smoothstreaming muxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 00:06:32 +02:00
Michael Niedermayer
217f6c53e5
Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'
...
* 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-29 16:37:22 +02:00
Michael Niedermayer
fd601ba6b1
Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'
...
* commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f':
segment: Add an option to prepend a string to the list entries
Conflicts:
doc/muxers.texi
libavformat/segment.c
See: 5e278c19c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 15:57:43 +02:00
Luca Barbato
5a70a783f0
hls: Add an option to prepend a baseurl to the playlist entries
...
Useful to generate playlists with absolute paths.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-29 12:14:11 +02:00
Enrique Arizón Benito
5c08ae4f37
segment: Add an option to prepend a string to the list entries
...
Useful to generate lists with absolute urls.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-29 12:14:00 +02:00
Michael Niedermayer
ef312b8f0f
Fix bistream typos
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27 15:30:25 +02:00
Michael Niedermayer
3a5ca79b0c
fix bistream typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27 15:21:48 +02:00
Andreas Cadhalpun
9898bd9a82
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 21:12:40 +01:00
Michael Niedermayer
4ba03e37fd
Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
...
* 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-19 22:09:10 +01:00
Luca Barbato
93632a70f9
doc: Name the MOV muxer as it should be called
...
The section name is the muxer, not the format.
2014-02-19 16:59:40 +01:00
Luca Barbato
a7b3216cbd
doc: Sort the muxer documentation
...
Keep the sections alphabetically sorted.
2014-02-19 16:59:40 +01:00
Timothy Gu
5607242155
doc/muxers: add "Options", "Examples", "Syntax", etc. subsections
...
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-19 13:40:37 +01:00
Stefano Sabatini
529573591a
doc/muxers/segment: fix formula for computing the segment_time_delta value
2014-01-19 12:20:10 +01:00
Michael Niedermayer
58770db2ae
Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
...
* 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-17 15:34:24 +01:00
Michael Niedermayer
5049b6a1fe
Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'
...
* 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-17 15:23:11 +01:00
Anton Khirnov
33018907bd
mp3enc: allow omitting the id3v2 header with -id3v2_version 0
2014-01-17 10:30:45 +01:00
Anton Khirnov
f9cc6883a4
mp3enc: add an option for disabling the Xing frame.
2014-01-17 10:30:45 +01:00
Stefano Sabatini
2358458a75
doc/muxers/image2: apply several formatting changes
2014-01-08 10:20:42 +01:00
Ramiro Polla
6a99ecb84e
doc/muxers/image2: document strftime option
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-01-08 10:10:32 +01:00
Helmut K. C. Tessarek
db70f2d36c
doc/muxers/matroska: add information to the matroska metadata language entry
2014-01-08 09:50:57 +01:00
Stefano Sabatini
a008deb17b
doc/muxers/matroska: reformat documentation
2014-01-08 09:46:51 +01:00
Stefano Sabatini
e3868cc588
doc/muxers/hls: change "can used" to "can be used"
...
Spotted-by: Alexander Strasser <eclipse7@gmx.net>
2014-01-02 09:37:43 +01:00
Stefano Sabatini
0aa325457d
doc/muxers/segment: clarify ambiguos reference
...
Replace "The segmenter muxer" with "This muxer". The "segmenter muxer"
was never defined before, and thus it is a slightly ambiguous term.
2014-01-02 00:52:01 +01:00
Stefano Sabatini
6cceef2ff9
doc/muxers/segment: reference hls muxer
2014-01-02 00:51:56 +01:00
Stefano Sabatini
f6707f0689
doc/muxers/hls: extend documentation
...
In particular, reference segment muxer and clarify difference between
segment filename number and playlist sequence number.
Should fix trac ticket #2601 .
2014-01-02 00:48:36 +01:00
Stefano Sabatini
81eff6e7a2
doc/muxers/tee: add example showing second level escaping
2013-12-15 20:04:06 +01:00
Stefano Sabatini
2364b4031d
doc/muxers/tee: use @ref to reference other sections
2013-12-15 20:04:06 +01:00
Stefano Sabatini
5e278c19c7
lavf/segment: add segment_list_entry_prefix option
...
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-25 19:12:16 +01:00
Stefano Sabatini
80e5859d7a
doc/muxers/segment: remove wrong default indication for segment_list_flags option
2013-11-19 23:24:54 +01:00
Clément Bœsch
3e036d407d
doc/muxers: document animated GIF muxer.
2013-11-07 20:30:43 +01:00
Stefano Sabatini
61c1f2cb1e
doc/muxers: add definitory line for the MOV/MP4/ISMV muxer
...
Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).
2013-10-29 18:30:27 +01:00
Stefano Sabatini
6230a95659
doc/muxers: itemize tee examples
...
Improve rendering.
2013-09-19 10:07:53 +02:00
Stefano Sabatini
7af7b45c38
lavf/image2: extend start_number range to accept zero
...
Address trac ticket #2884 .
2013-08-22 14:26:23 +02:00
Michael Niedermayer
d68adbd666
Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
...
* 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-22 13:37:16 +02:00
Stefano Sabatini
71c5f9d29c
doc/muxers: add elaborated example for the tee muxer
...
The example shows how to combine bsfs and select options.
2013-08-21 17:44:35 +02:00
Stefano Sabatini
5ae3563359
lavf/tee: add special select option
2013-08-21 17:44:35 +02:00
Clément Bœsch
f8ef91ff3d
movenc: add faststart option for web streaming
...
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>
2013-08-21 14:20:33 +01:00
Stefano Sabatini
faf7c35655
lavf/tee: add support for bitstream filtering
...
This allows to apply different bitstream filters to different outputs,
with no need to transcode.
2013-08-16 17:58:58 +02:00
Andrey Utkin
27cc3e72f8
doc/muxers: Document use case of mpegts muxer option tables_version
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-04 13:35:54 +02:00
Andrey Utkin
5b76c3a120
doc/muxers: Document previously undocumented mpegts muxer options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 20:30:33 +02:00
Stefano Sabatini
19ea08a11a
lavf/segment: add initial_offset option
...
Should address trac ticket #2224 .
2013-07-11 00:36:24 +02:00
Timothy Gu
4ec46b1160
doc/muxers: Add AIFF doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-07-03 11:25:45 +02:00
Stefano Sabatini
d47168e729
doc/muxers: apply various minor fixes to segment documentation
2013-06-29 14:12:11 +02:00
Stefano Sabatini
f150db096d
doc/muxers: sort muxers by name
2013-06-29 14:12:11 +02:00
Michael Niedermayer
6537827189
Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'
...
* commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521':
matroskaenc: add an option to put the index at the start of the file
Conflicts:
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 13:16:34 +02:00
Anton Khirnov
e3b225a4fe
matroskaenc: add an option to put the index at the start of the file
2013-05-03 08:32:35 +02:00
Michael Niedermayer
647fe2e777
Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
...
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
img2enc: add an option for overwriting one file with subsequent images
Conflicts:
doc/muxers.texi
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 21:50:53 +02:00
Anton Khirnov
9e6b5e61a0
img2enc: add an option for overwriting one file with subsequent images
...
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
2013-04-11 12:30:44 +02:00
Stefano Sabatini
d95143ec82
lavf/segment: add support to ffconcat segment list
2013-03-07 01:44:59 +01:00
Nicolas George
622a6f6f3b
doc/muxers: specify that tee needs -map.
...
Address trac ticket #2311 .
2013-03-05 14:20:18 +01:00
Stefano Sabatini
160def32da
doc/muxers: fix reference to @anchor defined in another manual
...
In particular, fix warnings:
*** Undefined node `quoting_and_escaping' in @ref (in doc/muxers.texi l. 767)
*** Undefined node `quoting_and_escaping' in @ref (in doc/muxers.texi l. 772)
2013-02-22 23:48:55 +01:00
Vicente Jimenez Aguilar
202b5f6deb
doc: Fix some obsolete references to av* tools as ff* tools
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
CC: libav-stable@libav.org
2013-02-18 13:04:29 +01:00
Nicolas George
f43d09cd60
lavf: add tee pseudo-muxer.
2013-02-09 20:50:11 +01:00
Stefano Sabatini
b868275ddb
doc/muxers: fix level for the segment options subsection
...
Properly declare it like a @subsection, rather than as a @section.
2013-02-01 18:14:05 +01:00
Carl Eugen Hoyos
99eedfc400
doc/muxers.texi: Fix mp3 picture attachment documentation.
2013-02-01 17:54:48 +01:00
Stefano Sabatini
1ec3324f00
lavf/img2enc: extend current options documentation
2013-01-25 00:04:23 +01:00
Stefano Sabatini
30a40d4a55
lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs
2013-01-22 20:25:45 +01:00
Stefano Sabatini
7694533fda
doc/muxers: remove outdated comment about live flags for the segment muxer
...
The live flags is currently unused, but still kept for backward
compatibility reasons (and in case it turns to be useful again for
whatever reason).
2013-01-22 20:25:33 +01:00
Stefano Sabatini
0f2d4eddd8
doc/muxers: extend and clarify documentation for the segment muxer time options
2013-01-21 19:26:44 +01:00
Stefano Sabatini
040c461ccf
doc/muxers: apply minor cosmetics to segment option descriptions
2013-01-19 00:51:28 +01:00
Stefano Sabatini
d4890c1068
lavf/segment: add support to segment list file entries sliding window listing
...
In particular, should fix trac ticket #1842 .
2013-01-19 00:22:58 +01:00
Carl Eugen Hoyos
c20ce9ad69
Add -movflags rtphint documentation.
2013-01-09 23:13:40 +01:00
Michael Niedermayer
4765f63538
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
xan: Convert to bytestream2
oggenc: add a page_duration option and deprecate the pagesize option
x86: lavr: add SSE2/AVX dither_int_to_float()
Conflicts:
libavcodec/xan.c
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-09 12:30:14 +01:00
Justin Ruggles
59220d559b
oggenc: add a page_duration option and deprecate the pagesize option
...
This uses page duration instead of byte size to determine when to buffer
the page. Also, it tries to avoid continued pages by buffering the current
page if there are already packets in the page and adding the next packet
would require it to be continued on a new page. This can improve seeking
performance.
The default page duration is 1 second, which is much saner than filling
all page segments by default.
2013-01-08 15:42:36 -05:00
Stefano Sabatini
82deb0c42e
doc/muxers: adopt new -codec:SPEC syntax in segment example
2013-01-02 16:30:11 +01:00
Stefano Sabatini
8bbe9d90fa
doc/muxers: add a dedicated section for segment examples
2013-01-02 16:29:58 +01:00
Stefano Sabatini
fd44dfb29d
doc/muxers: fix typos in the segment chapter
2013-01-02 16:29:42 +01:00
Stefano Sabatini
0156dd6530
lavf/segment: add segment_frames option
...
This is meant to address trac ticket #1483 .
2012-12-28 11:17:22 +01:00
Stefano Sabatini
7a8face9fb
lavf/segment: add reference_stream option
2012-12-28 10:57:02 +01:00
Stefano Sabatini
ddf6131a0a
lavf/segment: add segment_start_number option
...
Consistent with the image2 muxer.
2012-12-13 21:38:43 +01:00
Stefano Sabatini
8e9056559e
lavf/segment: add reset_timestamps option
...
The new options reset the timestamps at each new segment, so that the
generated segments will have timestamps starting close to 0.
It is meant to address trac ticket #1425 .
2012-12-11 00:18:23 +01:00
Michael Niedermayer
5de1f7a7bd
Merge commit '18e6f087c4a50bede8449ee164778945480be50c'
...
* commit '18e6f087c4a50bede8449ee164778945480be50c':
img2: document the options available
hls: improve options description
hls: use a meaningful long name
hls: add start_number option
h264: check for invalid zeros_left before writing
Conflicts:
doc/demuxers.texi
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09 13:35:49 +01:00
Luca Barbato
18e6f087c4
img2: document the options available
2012-12-08 17:04:23 +01:00
Luca Barbato
3c3a580f93
hls: improve options description
2012-12-08 17:04:23 +01:00
Luca Barbato
5fbceb2c63
hls: add start_number option
2012-12-08 17:04:22 +01:00
Michael Niedermayer
e13d5e9a4b
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
...
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 11:59:20 +01:00
Luca Barbato
22a0827dff
hlsenc: stand alone hls segmenter
...
Simplifies usage but has higher latency.
2012-11-13 01:37:05 +01:00
Clément Bœsch
e168165489
doc/muxers: document mov faststart option.
2012-10-21 20:23:09 +02:00
Stefano Sabatini
00d516454c
lavf/segment: add segment_list_flags option
...
Allow to specify options affecting the segment list generation.
In particular: add +live and +cache flags.
For a full discussion read trac ticket #1642 :
http://ffmpeg.org/trac/ffmpeg/ticket/1642
Also add live M3U8 generation example.
2012-09-11 01:24:54 +02:00
Stefano Sabatini
ebd703f0a0
lavf/segment: deprecate "ext" format in favor of "csv"
...
The new option name is more descriptive.
2012-09-04 11:27:55 +02:00
Stefano Sabatini
d815763548
lavf/segment: add escaping for filename field of the CSV list file
...
CSV escaping code is borrowed from ffprobe.c.
2012-09-04 11:25:14 +02:00
Stefano Sabatini
69fc2489c4
doc/muxers: simplify segment examples
...
The simplifications are due to the recent option changes.
2012-08-18 12:32:54 +02:00
Stefano Sabatini
2d31ae2921
lavf/segment: change default value for segment_list_size option, from 5 to 0
...
This is technically a major compatibility break, but seems the most
natural default and what users would expect without reading the docs.
2012-08-18 12:32:23 +02:00
Stefano Sabatini
1c522e3868
lavf/segment: guess list type from list filename suffix
2012-08-18 12:31:49 +02:00
Stefano Sabatini
e5ae2f9126
lavf/segment: add M3U8 list support
...
Address trac ticket #1642 .
2012-08-18 11:21:47 +02:00
Michael Bradshaw
a22c996a85
Add ICO muxer
...
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-14 16:54:25 +02:00
Stefano Sabatini
aef9e94f73
lavf/segment: add -segment_time_delta option
2012-07-10 00:53:01 +02:00
Stefano Sabatini
2058b52cf8
lavf/segment: add -segment_times option
...
Address trac ticket #1504 .
2012-07-10 00:49:43 +02:00
Stefano Sabatini
8dc31f8da8
lavf/segment: make use of av_parse_time() when parsing the -segment_time value
...
Increase flexibility/consistency.
Also rename recording_time field to time, for enhanced
consistency/readability.
2012-07-08 17:38:04 +02:00
Stefano Sabatini
0a7b8effbb
doc/muxers: sort options for the segment muxer
2012-07-08 17:08:56 +02:00
Stefano Sabatini
7f08bfae6e
lavf/segment: add segment_list_type option, extend format for the segment list file
...
Add list extended format which specifies in the list file the start and
ending time for each segment. This is required to make it available this
information to external tools, avoiding the need to perform file analysis
in the output segments.
2012-07-08 17:08:56 +02:00
Stefano Sabatini
776a4e42a7
doc/muxers/segment: apply minor documentation updates and adjustements
...
Update documentation to match code behavior after previous changes, also
reword the examples section.
2012-07-04 01:17:58 +02:00