summaryrefslogtreecommitdiff
path: root/libavfilter/setpts.c
Commit message (Collapse)AuthorAge
* Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'Michael Niedermayer2014-08-21
|\ | | | | | | | | | | | | | | | | | | * commit '593aaee953f8b07c141ff115e67bae85ef0350c7': setpts: Add missing inttypes.h #include for PRId64 Conflicts: libavfilter/setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * setpts: Add missing inttypes.h #include for PRId64Diego Biurrun2014-08-21
| | | | | | | | Also convert a debug av_log() to av_dlog().
* | Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'Michael Niedermayer2014-04-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58400ac133bcfb6bf8196b4e5208bc178307739b': lavfi: name anonymous structs Conflicts: libavfilter/buffersink.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_showinfo.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: name anonymous structsVittorio Giovara2014-04-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: do not export the filters from shared objectsAnton Khirnov2013-10-28
| |
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-16
| |
* | avfilter: various cosmeticsPaul B Mahol2013-09-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: remove redundant .get_(audio/video)_buffer initializationsPaul B Mahol2013-09-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/setpts: make use of AVFILTER_DEFINE_CLASSPaul B Mahol2013-05-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'Michael Niedermayer2013-05-01
|/ | | | | | | | | | | | | | | | | * commit 'b472938233b98178ed6c1353c37e0dc7ab585902': lavfi: add an asetpts filter Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/f_setpts.c libavfilter/setpts.c libavfilter/version.h libavfilter/vf_setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: add an asetpts filterAnton Khirnov2013-04-30
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 21:19:46 +0000