mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-03-03 19:18:01 +00: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
|
||
|---|---|---|
| .. | ||
| arm | ||
| avr32 | ||
| bfin | ||
| mips | ||
| ppc | ||
| sh4 | ||
| tomi | ||
| x86 | ||
| adler32.c | ||
| adler32.h | ||
| aes.c | ||
| aes.h | ||
| atomic_gcc.h | ||
| atomic_suncc.h | ||
| atomic_win32.h | ||
| atomic.c | ||
| atomic.h | ||
| attributes.h | ||
| audio_fifo.c | ||
| audio_fifo.h | ||
| audioconvert.h | ||
| avassert.h | ||
| avstring.c | ||
| avstring.h | ||
| avutil.h | ||
| base64.c | ||
| base64.h | ||
| blowfish.c | ||
| blowfish.h | ||
| bprint.c | ||
| bprint.h | ||
| bswap.h | ||
| buffer_internal.h | ||
| buffer.c | ||
| buffer.h | ||
| channel_layout.c | ||
| channel_layout.h | ||
| colorspace.h | ||
| common.h | ||
| cpu.c | ||
| cpu.h | ||
| crc.c | ||
| crc.h | ||
| des.c | ||
| des.h | ||
| dict.c | ||
| dict.h | ||
| error.c | ||
| error.h | ||
| eval.c | ||
| eval.h | ||
| fifo.c | ||
| fifo.h | ||
| file.c | ||
| file.h | ||
| float_dsp.c | ||
| float_dsp.h | ||
| frame.c | ||
| frame.h | ||
| hmac.c | ||
| hmac.h | ||
| imgutils.c | ||
| imgutils.h | ||
| integer.c | ||
| integer.h | ||
| internal.h | ||
| intfloat_readwrite.c | ||
| intfloat_readwrite.h | ||
| intfloat.h | ||
| intmath.c | ||
| intmath.h | ||
| intreadwrite.h | ||
| lfg.c | ||
| lfg.h | ||
| libavutil.v | ||
| libm.h | ||
| lls.c | ||
| lls.h | ||
| log2_tab.c | ||
| log.c | ||
| log.h | ||
| lzo.c | ||
| lzo.h | ||
| Makefile | ||
| mathematics.c | ||
| mathematics.h | ||
| md5.c | ||
| md5.h | ||
| mem.c | ||
| mem.h | ||
| old_pix_fmts.h | ||
| opt.c | ||
| opt.h | ||
| parseutils.c | ||
| parseutils.h | ||
| pca.c | ||
| pca.h | ||
| pixdesc.c | ||
| pixdesc.h | ||
| pixfmt.h | ||
| qsort.h | ||
| random_seed.c | ||
| random_seed.h | ||
| rational.c | ||
| rational.h | ||
| rc4.c | ||
| rc4.h | ||
| samplefmt.c | ||
| samplefmt.h | ||
| sha.c | ||
| sha.h | ||
| softfloat.c | ||
| softfloat.h | ||
| time.c | ||
| time.h | ||
| timecode.c | ||
| timecode.h | ||
| timer.h | ||
| timestamp.h | ||
| tree.c | ||
| tree.h | ||
| utils.c | ||
| version.h | ||
| x86_cpu.h | ||
| xga_font_data.c | ||
| xga_font_data.h | ||
| xtea.c | ||
| xtea.h | ||