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
e3b225a4fe
matroskaenc: add an option to put the index at the start of the file
2013-05-03 08:32:35 +02:00
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
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
d95143ec82
lavf/segment: add support to ffconcat segment list
2013-03-07 01:44:59 +01:00
622a6f6f3b
doc/muxers: specify that tee needs -map.
...
Address trac ticket #2311 .
2013-03-05 14:20:18 +01:00
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
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
f43d09cd60
lavf: add tee pseudo-muxer.
2013-02-09 20:50:11 +01:00
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
99eedfc400
doc/muxers.texi: Fix mp3 picture attachment documentation.
2013-02-01 17:54:48 +01:00
1ec3324f00
lavf/img2enc: extend current options documentation
2013-01-25 00:04:23 +01:00
30a40d4a55
lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs
2013-01-22 20:25:45 +01:00
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
0f2d4eddd8
doc/muxers: extend and clarify documentation for the segment muxer time options
2013-01-21 19:26:44 +01:00
040c461ccf
doc/muxers: apply minor cosmetics to segment option descriptions
2013-01-19 00:51:28 +01:00
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
c20ce9ad69
Add -movflags rtphint documentation.
2013-01-09 23:13:40 +01:00
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
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
82deb0c42e
doc/muxers: adopt new -codec:SPEC syntax in segment example
2013-01-02 16:30:11 +01:00
8bbe9d90fa
doc/muxers: add a dedicated section for segment examples
2013-01-02 16:29:58 +01:00
fd44dfb29d
doc/muxers: fix typos in the segment chapter
2013-01-02 16:29:42 +01:00
0156dd6530
lavf/segment: add segment_frames option
...
This is meant to address trac ticket #1483 .
2012-12-28 11:17:22 +01:00
7a8face9fb
lavf/segment: add reference_stream option
2012-12-28 10:57:02 +01:00
ddf6131a0a
lavf/segment: add segment_start_number option
...
Consistent with the image2 muxer.
2012-12-13 21:38:43 +01:00
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
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
18e6f087c4
img2: document the options available
2012-12-08 17:04:23 +01:00
3c3a580f93
hls: improve options description
2012-12-08 17:04:23 +01:00
5fbceb2c63
hls: add start_number option
2012-12-08 17:04:22 +01:00
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
22a0827dff
hlsenc: stand alone hls segmenter
...
Simplifies usage but has higher latency.
2012-11-13 01:37:05 +01:00
e168165489
doc/muxers: document mov faststart option.
2012-10-21 20:23:09 +02:00
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
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
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
69fc2489c4
doc/muxers: simplify segment examples
...
The simplifications are due to the recent option changes.
2012-08-18 12:32:54 +02:00
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
1c522e3868
lavf/segment: guess list type from list filename suffix
2012-08-18 12:31:49 +02:00
e5ae2f9126
lavf/segment: add M3U8 list support
...
Address trac ticket #1642 .
2012-08-18 11:21:47 +02:00
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
aef9e94f73
lavf/segment: add -segment_time_delta option
2012-07-10 00:53:01 +02:00
2058b52cf8
lavf/segment: add -segment_times option
...
Address trac ticket #1504 .
2012-07-10 00:49:43 +02:00
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
0a7b8effbb
doc/muxers: sort options for the segment muxer
2012-07-08 17:08:56 +02:00
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
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
567eb9d344
lavf/segment: fix command with missing -list option
...
Replace -list with the correct option -segment_list.
2012-06-29 14:50:27 +02:00
815d8f8841
doc/muxers: add documentation for the md5 and framemd5 muxers
...
Address trac ticket #1153 .
2012-04-07 13:57:40 +02:00
Michael Niedermayer
Anton Khirnov
Stefano Sabatini
Nicolas George
Vicente Jimenez Aguilar
Carl Eugen Hoyos
Justin Ruggles
Luca Barbato
Clément Bœsch
Michael Bradshaw