generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
59,972 Commits 24 Branches 241 Tags 173 MiB
5607242155
Commit Graph

118 Commits

Author SHA1 Message Date
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