Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-13 19:05:37 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/doc
History
Michael Niedermayer a05a44e205 Merge commit '7e350379f8' 
* commit '7e350379f8':
  lavfi: switch to AVFrame.

Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h

Following are notes about the merge authorship and various technical details.

Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif

Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534 by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together

Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile

Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads

Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect

Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 01:40:35 +01:00
..
doxy doc: support the new website layout 2012-10-08 11:22:42 +02:00
examples examples/muxing: fix memory leak. 2013-03-05 15:43:32 +01:00
APIchanges Merge commit 'efa7f42020' 2013-03-08 14:57:41 +01:00
authors.texi doc: use a common authors.texi file blurb 2012-12-19 09:33:43 +01:00
avtools-common-opts.texi doc: remove inclusion of libav* documentation in tools 2012-12-20 23:48:23 +01:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
bitstream_filters.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
build_system.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
decoders.texi doc/decoders: fix typo in "@Options" 2012-12-06 10:16:10 +01:00
default.css doc/default.css: use ffmpeg.org website CSS 2012-12-22 00:38:48 +01:00
demuxers.texi lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
developer.texi Merge commit '040c565e51' 2013-02-24 14:32:55 +01:00
doxy-wrapper.sh doc: add apidoc target for doxygen API documentation 2012-11-02 18:28:56 +01:00
Doxyfile Merge commit '511cf612ac' 2012-12-21 17:32:52 +01:00
encoders.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
errno.txt doc: add a list of errno codes on some systems. 2011-12-21 19:59:45 +01:00
eval.texi eval: print() support 2013-02-17 17:36:27 +01:00
faq.texi doc/faq: fill missing word in the concat protocol entry 2013-01-25 00:04:22 +01:00
fate.texi doc/fate: Move fate config example into doc subdirectory 2012-09-29 19:27:01 +02:00
fate_config.sh.template doc/fate: Move fate config example into doc subdirectory 2012-09-29 19:27:01 +02:00
ffmpeg-bitstream-filters.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-codecs.texi doc/codecs: simple sub_charenc option documentation. 2013-02-17 16:58:19 +01:00
ffmpeg-devices.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-filters.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-formats.texi lavf: clarify/extend documentation for AVFormatContext::analyzeduration 2013-01-13 15:09:09 +01:00
ffmpeg-protocols.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-resampler.texi doc/resampler: fix two typo. 2013-02-14 23:43:08 +01:00
ffmpeg-scaler.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-utils.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg.texi Improve dump_attachment documentation. 2013-02-28 08:57:10 +01:00
ffmpeg.txt Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
ffplay.texi doc: fix reference to ffmpeg-bitstream-filters.html page 2013-02-15 18:56:27 +01:00
ffprobe.texi doc: fix reference to ffmpeg-bitstream-filters.html page 2013-02-15 18:56:27 +01:00
ffprobe.xsd ffprobe: show pkt_size in frame 2012-12-15 11:46:47 +01:00
ffserver.conf Merge commit 'bf5f46b4cc' 2012-11-16 13:07:10 +01:00
ffserver.texi doc: fix reference to ffmpeg-bitstream-filters.html page 2013-02-15 18:56:27 +01:00
filter_design.txt doc: update filter_design.txt to API changes. 2013-02-02 19:16:11 +01:00
filters.texi Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
general.texi EVRC decoder 2013-01-21 10:24:45 +00:00
git-howto.texi doc: git-howto: Leave reviewers time to react before pushing patches 2012-11-11 20:43:28 +01:00
git-howto.txt githowto: git is generally available as package in most distros. 2011-11-23 23:03:37 +01:00
indevs.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavcodec.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavdevice.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavfilter.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavformat.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavutil.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libswresample.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libswscale.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
Makefile Merge commit '7a95afe433' 2013-01-24 14:35:15 +01:00
metadata.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
mips.txt mips: Optimization of AC3 FP encoder and EAC3 FP decoder 2012-11-19 22:24:44 +01:00
multithreading.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
muxers.texi lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
nut.texi Drop Snow codec 2013-01-06 16:30:02 +01:00
optimization.txt Merge commit '88bd7fdc82' 2013-01-23 17:44:56 +01:00
outdevs.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
platform.texi doc/platform: Fix 10l typo 2013-02-13 18:41:37 -05:00
print_options.c print_options: warn that the files are generated. 2012-04-23 18:14:25 +02:00
protocols.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
rate_distortion.txt miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
RELEASE_NOTES Merge commit 'b14e89b3c5' 2013-01-05 13:27:59 +01:00
snow.txt Drop Snow codec 2013-01-06 16:30:02 +01:00
soc.txt Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swresample.txt Fix a few "its" vs "it's" typo. 2013-02-14 23:45:48 +01:00
swscale.txt x86: mmx2 ---> mmxext in comments and messages 2012-10-31 00:37:42 +01:00
syntax.texi lavu/parseutils: allow MM:SS format for duration in av_parse_time() 2013-02-22 23:43:46 +01:00
t2h.init Merge commit 'f90ff772e7' 2013-01-27 13:32:56 +01:00
tablegen.txt Update tablegen documentation for WRITE_ARRAY macro. 2010-06-27 14:31:50 +00:00
texi2pod.pl doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields 2013-03-07 01:44:59 +01:00
viterbi.txt miscellaneous typo fixes 2012-12-21 00:18:34 +01:00