virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
68,538 Commits 37 Branches 400 Tags 465 MiB
7ef515cda5
Commit Graph

5161 Commits

Author SHA1 Message Date
Lou Logan
a9a3c005b8 doc/filters: fix typos and spelling errors 
Prompted-by: Carl Oxwall <@oxwall>
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-12-16 10:32:00 -09:00
Paul B Mahol
5f90ef6611 lavfi: add colorlevels filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-12-16 10:10:04 +00:00
Michael Niedermayer
c1d9283b1e doc/ffplay: remove duplicate threads option, this is documented in codecs.* 
Fixes Ticket3610

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 17:54:14 +01:00
Lou Logan
10ef8f063b doc: add FFREPORT example 
And fix a few nits.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-12-12 16:51:16 -09:00
Arwa Arif
9f85c273a3 Delete mp=uspp 2014-12-12 18:28:31 +00:00
Arwa Arif
100fc395b6 lavfi: USPP Filter 
Previous version reviewed by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-12 01:03:44 +01:00
Lou Logan
55c5a38369 doc: add loglevel numerical values 
Useful for setting FFREPORT log level.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-12-10 16:45:31 -09:00
Christian Suloway
97b65f6126 avformat/hlsenc: added segment file deletion 
This option flag deletes segment files removed from the playlist after a
period of time equal to the duration of the segment plus the duration of
the playlist.

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 23:49:25 +01:00
Michael Niedermayer
b1c8dfc84e doc/filters: Add ascii graphics to clarify what the currently implemented tinterlace modes do 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-07 20:41:35 +01:00
Timothy Gu
4a27f05d14 doc: html: Use native viewport 
Fixes displaying docs on small-screen devices.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 02:48:17 +01:00
Timothy Gu
cd6f0f28bc doc: Do not use the headings as links to TOC anchors 
Instead, use FontAwesome icons (if configured to be this way) or separate
text.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 02:42:19 +01:00
Christian Suloway
1c639fa6e0 avformat/hlsenc: added segment filename option 
This option allows segment filenames to be specified. Unless -hls_flags
single_file is set the filename is used as a string format with the
segment number.

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -hls_segment_filename
bar%03d.ts foo.m3u8

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 02:28:23 +01:00
Michael Niedermayer
a0d0799ea2 Merge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9' 
* commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9':
  APIchanges: mark the release 11 branch point

Conflicts:
	doc/APIchanges

Not merged as the contents in our APIchanges differ and it could be confusing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 00:37:25 +01:00
Piotr Fusik
c99e5191ab doc/examples/filtering_video: fix frame rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 16:52:19 +01:00
Steve Jiekak
6e9ac02af8 add av_dv_codec_profile2 : uses framerate to select best matching profile. default on first matching profile 
Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 20:23:52 +01:00
Michael Niedermayer
bde27e1e61 doc/examples/transcoding: check encoder before using it 
Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 18:58:38 +01:00
Michael Niedermayer
0f16ab18db doc/APIchanges: add 2.5 cut marker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 01:28:40 +01:00
Michael Niedermayer
43520771f1 doc/APIchanges: fill in hashes and dates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 22:40:02 +01:00
wm4
1eec9bfc38 APIchanges: mark the release 11 branch point 2014-12-03 15:13:36 +00:00
Christophe Gisquet
55a06b4619 doc: mention the noise_bsf parameter in the docs 
This looks more like a seed than an amount, as the variable name
could lead to think.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-01 23:47:07 +01:00
Andreas Cadhalpun
928322c15f doc: correct license template for t2h.pm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-01 00:47:35 +01:00
Andreas Cadhalpun
b28652599d doc: fix spelling errors 
succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-01 00:31:06 +01:00
Christophe Gisquet
4c592c3908 ffmpeg: take bsf arguments from the command line 
The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-30 13:11:34 +01:00
Lukasz Marek
aaf6cc925f ffserver: allow skip setting defaults 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:33 +01:00
Benoit Fouet
155f4dd668 doc: add entry for APNG demuxer where needed. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-25 18:28:32 +01:00
Michael Niedermayer
c724c82a78 doc/print_options: Fix build on mingw after 960aff379d 
A cleaner fix is very welcome

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-25 04:04:00 +01:00
Michael Niedermayer
e6ea75c5e6 doc/examples/decoding_encoding: fix storing all channels 
Fixes Ticket3355

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-24 22:01:33 +01:00
Michael Niedermayer
230aeee94c doc: fix the the typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 02:09:09 +01:00
TOYAMA Shin-ichi
e01acd868b doc/decoders.texi: typo in description for option ifo_palette 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 02:07:01 +01:00
Lukasz Marek
ab922f9ef1 lavu/dict: add av_dict_get_string 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-21 01:25:54 +01:00
Clément Bœsch
de8cd93a05 doc/writing_filters: use ffmpeg.org instead of wikimedia.org for lena image 
Less likely to change, and under our control.

Thanks-to: Michael Niedermayer
 2014-11-19 19:55:02 +01:00
Clément Bœsch
568f1ecccf doc/writing_filters: fix reference to Lenna image 2014-11-18 21:12:17 +01:00
Clément Bœsch
6da12d46d3 doc/writing_filters: use a more portable sed command in the walk-through 2014-11-18 21:10:40 +01:00
Simon Thelen
43c1d82b86 doc/filters: use '|' instead of ':' in the documentation. 
Using colons to separate the outdefs is deprecated. Switch to using '|'
to separate the list items.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 16:38:09 +01:00
Michael Niedermayer
4eae568a07 doc/APIchanges: Fix some wrong versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 11:52:17 +01:00
Michael Niedermayer
a54a51cc9b avutil/float_dsp: add avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 11:43:01 +01:00
Lukasz Marek
a38e06c1aa ffserver_config: handle codec private options 
This commit allows to set codec's private option.
As side effect, it also improves preset support.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
Lukasz Marek
6690d4c3f5 lavf/ffm: store/restore private codec context 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
Lukasz Marek
bee5844ddd lavu/opt: introduce av_opt_serialize() 
Function allows to create string containing object's serialized options.
Such string may be passed back to av_set_options_string() in order to restore options.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
Lukasz Marek
eec693328a lavu/opt: introduce av_opt_is_set_to_default() 
New function allows to check if option is set to its default value

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
Shin-ichi Toyama
12630fa821 avcodec/dvdsubdec: New option for obtaining global palette from .IFO file (experimental) 
Suggested-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 12:50:39 +01:00
Thilo Borgmann
e6e6149630 doc/indevs: Rework and update documentation of AVFoundation device. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 18:28:12 +01:00
Clément Bœsch
ff9b21776b doc/filters: explicit and complete xBR documentation 2014-11-10 06:36:31 +01:00
Arwa Arif
19d0949d31 lavfi: add xbr filter xBR 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 03:45:00 +01:00
Michael Niedermayer
0bdc5db520 Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb' 
* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb':
  movenc: Remove an outdated comment

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-08 10:57:10 +01:00
Martin Storsjö
95a449d3ce movenc: Remove an outdated comment 
QuickTime does support files with an empty initial movie
these days.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-08 11:13:37 +02:00
Michael Niedermayer
66e49ff3b9 Merge commit '1384df641994bf3d6cb51084290aa94752737bae' 
* commit '1384df641994bf3d6cb51084290aa94752737bae':
  lavf: Add an option for avoiding negative timestamps

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

See: 3ba0dab76a
See: a89c012531
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 23:09:30 +01:00
Michael Niedermayer
1384df6419 lavf: Add an option for avoiding negative timestamps 
This is the same logic as is invoked on AVFMT_TS_NEGATIVE,
but which can be enabled manually, or can be enabled
in muxers which only need it in certain conditions.

Also allow using the same mechanism to force streams to start
at 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-07 12:11:35 +02:00
Thilo Borgmann
93ab6693d8 lavd/avfoundation: Update documentation to mention audio capabilities. 
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 23:30:19 +01:00
Michael Niedermayer
44fa2671e0 Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70' 
* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
  lavc: add a public API for parsing vorbis packets.

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/version.h
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 11:21:47 +01:00