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

18 Commits

Author SHA1 Message Date
Michael Niedermayer
325f6e0a97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:58:11 +01:00
Paul B Mahol
563057731a avfilter/vf_stereod3d: add const qualifiers to ana_convert() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 12:37:29 +00:00
Paul B Mahol
c74d5929df avfilter/vf_stereo3d: BGR24 support for anaglyphs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 12:37:29 +00:00
Paul B Mahol
fcea6f71ad avfilter/vf_stereo3d: avoid pointless copy 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 12:37:29 +00:00
Paul B Mahol
b211607b5c avfilter: various cosmetics 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:01:43 +00:00
Paul B Mahol
85a22099a7 lavfi/stereo3d: subsampled yuv support for non-anaglyph outputs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-14 21:57:03 +00:00
Paul B Mahol
2bdd434931 lavfi/stereo3d: add support for alternating frames input & output format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 09:13:36 +00:00
Paul B Mahol
6a8d05061f lavfi/stereo3d: avoid division when changing aspect ratio 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-26 10:13:50 +00:00
Paul B Mahol
a56fd051ee lavfi/stereo3d: support more formats for non-anaglyph outputs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-20 17:45:54 +00:00
Paul B Mahol
1de7dcb457 lavfi/stereo3d: fix interleave row output modes 
Linesizes that did not match output width produced several artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 17:34:17 +00:00
Paul B Mahol
716588188d lavfi/stereo3d: check input width & height 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 15:16:48 +00:00
Paul B Mahol
b725202546 lavfi/stereo3d: fix output width for sbsl/sbs2l 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 12:21:47 +00:00
Paul B Mahol
83253431b7 lavfi/stereo3d: remove pointless store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-16 21:07:21 +00:00
Clément Bœsch
d5226fc575 lavfi/stereo3d: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
Paul B Mahol
c5b484e616 lavfi/vf_stereo3d: use standard options parsing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-21 09:17:32 +00:00
Michael Niedermayer
a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* 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
      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
Michael Niedermayer
4c56b79a16 vf_stereo3d: Add AVOption table terminator 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 22:29:57 +01:00
Paul B Mahol
3f35f36a2e lavfi: port MP stereo3d filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-05 18:36:40 +00:00