summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.c
Commit message (Collapse)AuthorAge
...
* | overlay: do not leak x/y expressions.Nicolas George2012-01-15
| |
* | Mark AVFilterPad[] compound literals as const.Reimar Döffinger2011-11-06
| | | | | | | | | | | | | | GCC 4.6.2 at least still seems to fail to put them in .rodata though, see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303 Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Make another PixelFormat list const.Reimar Döffinger2011-11-05
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add const to static arrays where it was forgotten.Reimar Döffinger2011-11-05
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | vf_overlay: adopts FAST_DIV255 macro for calculating destination alphaStefano Sabatini2011-11-02
| | | | | | | | Ease readability, improve exactness.
* | vf_overlay: add support to alpha pre-multiplication in the RGBA pathStefano Sabatini2011-10-31
| | | | | | | | | | | | | | | | Based on the work of Mark Himsley <mark@mdsh.com>. See thread: Subject: [FFmpeg-devel] libavfilter: extending overlay filter Date: Sun, 13 Mar 2011 14:18:42 +0000
* | vf_overlay: enable RGB pathStefano Sabatini2011-10-31
| | | | | | | | Add option rgb which forces the RGB path.
* | vf_overlay: use opt.h API for setting optionsStefano Sabatini2011-10-30
| | | | | | | | Extend syntax, allow to easily add more options later.
* | vf_overlay: remove mathematical constants now redundant.Nicolas George2011-10-13
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Do not include mathematics.h in avutil.hMans Rullgard2011-07-03
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | Merge libavcore into libavutilReinhard Tartler2011-02-16
|/ | | | Done to keep ABI compatible. Otherwise this is just silly
* Fix timestamp scaling in the overlay filter.Stefano Sabatini2010-11-25
| | | | | | | Compute the outpicref PTS in start_frame(), since it is required for comparing that value with the value of the overpicref. Originally committed as revision 25828 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Port overlay filter from the libavfilter repo (with many fixes),Stefano Sabatini2010-11-21
adopting Baptiste variant which is simpler and faster. Originally committed as revision 25784 to svn://svn.ffmpeg.org/ffmpeg/trunk