mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-03 05:10:03 +02:00
a05a44e205
* commit '7e350379f87e7f74420b4813170fe808e2313911':
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
|
||
|---|---|---|
| .. | ||
| doxy | ||
| examples | ||
| APIchanges | ||
| authors.texi | ||
| avtools-common-opts.texi | ||
| avutil.txt | ||
| bitstream_filters.texi | ||
| build_system.txt | ||
| decoders.texi | ||
| default.css | ||
| demuxers.texi | ||
| developer.texi | ||
| doxy-wrapper.sh | ||
| Doxyfile | ||
| encoders.texi | ||
| errno.txt | ||
| eval.texi | ||
| faq.texi | ||
| fate_config.sh.template | ||
| fate.texi | ||
| ffmpeg-bitstream-filters.texi | ||
| ffmpeg-codecs.texi | ||
| ffmpeg-devices.texi | ||
| ffmpeg-filters.texi | ||
| ffmpeg-formats.texi | ||
| ffmpeg-protocols.texi | ||
| ffmpeg-resampler.texi | ||
| ffmpeg-scaler.texi | ||
| ffmpeg-utils.texi | ||
| ffmpeg.texi | ||
| ffmpeg.txt | ||
| ffplay.texi | ||
| ffprobe.texi | ||
| ffprobe.xsd | ||
| ffserver.conf | ||
| ffserver.texi | ||
| filter_design.txt | ||
| filters.texi | ||
| general.texi | ||
| git-howto.texi | ||
| git-howto.txt | ||
| indevs.texi | ||
| issue_tracker.txt | ||
| libavcodec.texi | ||
| libavdevice.texi | ||
| libavfilter.texi | ||
| libavformat.texi | ||
| libavutil.texi | ||
| libswresample.texi | ||
| libswscale.texi | ||
| Makefile | ||
| metadata.texi | ||
| mips.txt | ||
| multithreading.txt | ||
| muxers.texi | ||
| nut.texi | ||
| optimization.txt | ||
| outdevs.texi | ||
| platform.texi | ||
| print_options.c | ||
| protocols.texi | ||
| rate_distortion.txt | ||
| RELEASE_NOTES | ||
| snow.txt | ||
| soc.txt | ||
| swresample.txt | ||
| swscale.txt | ||
| syntax.texi | ||
| t2h.init | ||
| tablegen.txt | ||
| texi2pod.pl | ||
| viterbi.txt | ||