Reimar Döffinger
1109680434
Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."
...
This reverts commit a6213f3dce
.
2011-06-26 09:49:36 +02:00
Michael Niedermayer
4ccb7911ba
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ARM: silence some annoying armcc warnings
ffplay: Remove unused-but-set channels variable from update_sample_display().
build: Add DEP_LIBS dependency directly to the shared library build rule.
build: Remove multiple inclusion guards from config.mak.
build: Remove redundant config.mak includes from subdirectory Makefiles.
aacenc: Mark psy_3gpp_window() as av_unused.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-26 02:31:32 +02:00
Diego Biurrun
a6213f3dce
build: Remove redundant config.mak includes from subdirectory Makefiles.
...
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
2011-06-25 13:02:51 +02:00
Stefano Sabatini
c6e288a7cd
lavfi: fix Makefile HEADERS
...
Add a missing space between vsink_buffer.h and vsrc_buffer.h.
1000l.
2011-06-19 22:58:31 +02:00
Stefano Sabatini
44f669e7bc
lavfi: add vsink_buffer, and use it in ff* tools
...
Also add the public interface libavfilter/vsink_buffer.h.
2011-06-19 19:18:33 +02:00
Stefano Sabatini
15f03725ce
lavfi: add negate filter
...
This filter is a simple wrapper around the LUT filter.
2011-06-19 19:06:55 +02:00
Stefano Sabatini
dd2793c880
lavfi: add LUT (LookUp Table) generic filters
2011-06-19 19:06:35 +02:00
Stefano Sabatini
07586b68a8
lavfi: add select filter
...
Address trac issue #92 .
2011-05-25 12:54:07 +02:00
Stefano Sabatini
83db719777
lavfi: make vsrc_buffer.h header public
...
Address trac issue #33 .
2011-05-22 19:30:47 +02:00
Bobby Bingham
a38a00eddf
libavfilter: vf_split from soc.
...
Commited by michael, for detailed authorship see soc repo
2011-05-21 17:23:29 +02:00
Stefano Sabatini
566666caf3
lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()
...
avfilter_copy_frame_props() avoids code duplication and increases
robustness.
The added files libavfilter/avcodec.[ch] are used for containing
utilities useful for gluing togheter libavfilter and libavcodec.
2011-05-07 12:03:49 +02:00
Stefano Sabatini
a5b64584f3
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo
...
With the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
* fix minor errors and typos in the filter description
* extend/clarify examples in the filter description
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:17:40 +02:00
Stefano Sabatini
31d8467d82
lavfi: add showinfo filter
2011-04-27 11:12:45 +02:00
Mark Himsley
2f84bb4236
lavfi: add fieldorder filter
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-26 07:37:41 +02:00
Mark Himsley
aa0c515a3c
lavfi: add fieldorder filter
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-04-11 00:14:21 +02:00
Brandon Mintern
aadfc9ee74
lavfi: add fade filter
...
Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-03 08:47:16 +02:00
Carl Eugen Hoyos
8214249051
Add libmpcodecs to the list of libavfilter subdirectories.
2011-02-25 15:34:20 +01:00
Stefano Sabatini
bd8e750300
Port drawtext filter by Hemanth from the libavfilter soc repo, with
...
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:45 +01:00
Stefano Sabatini
c8c0189d62
lavfi: put color source in a dedicated file
...
Move the color source code from vf_pad.c to vsrc_color.c.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-21 14:09:46 +00:00
Stefano Sabatini
5ad06110e0
lavfi: add drawutils
...
Add drawutils.h and drawutils.c, and use them in the pad filter.
The new functions are going to be shared by other filters.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-21 14:09:08 +00:00
Brandon Mintern
704865fc87
lavfi: add fade filter
...
Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-21 13:56:48 +01:00
Stefano Sabatini
fd0b42cce0
lavfi: put color source in a dedicated file
...
Move the color source code from vf_pad.c to vsrc_color.c.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-21 13:45:44 +01:00
Stefano Sabatini
bcfd9e821b
lavfi: add drawutils
...
Add drawutils.h and drawutils.c, and use them in the pad filter.
The new functions are going to be shared by other filters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-21 13:44:52 +01:00
Reinhard Tartler
7ffe76e540
Merge libavcore into libavutil
...
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f
Merge libavcore into libavutil
...
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>
2011-02-15 16:18:21 +01:00
Stefano Sabatini
9b8bb626dc
libavfilter: add video movie source
...
See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-09 03:33:28 +01:00
Stefano Sabatini
9409c3811c
libavfilter: add video movie source
...
See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-08 13:20:56 +01:00
Michael Niedermayer
be3e8eda5a
Add forgotten dependancy of avcodec for vf_mp.c
2011-01-28 19:04:24 +01:00
Michael Niedermayer
fd4c59b519
Enable libmpcodecs support.
2011-01-20 03:27:01 +01:00
Stefano Sabatini
b567020943
Add copy filter, useful for testing the avfilter_draw_slice() copy
...
code.
Originally committed as revision 26112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 01:01:09 +00:00
Stefano Sabatini
cf69ad35c5
Redesign the libopencv wrapper to make it more generic. Accept both
...
FILTERNAME=ARGS and FILTERNAME:ARGS syntax.
The same filter class will be used for managing all the libopencv
filtering functions.
Originally committed as revision 26079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-23 17:24:19 +00:00
Nolan L
d5f187fd33
Add gradfun filter, ported from MPlayer.
...
Patch by Nolan L nol888 <=> gmail >=< com.
See thread:
Subject: [FFmpeg-devel] [PATCH] Port gradfun to libavfilter (GCI)
Date: Mon, 29 Nov 2010 07:18:14 -0500
Originally committed as revision 25942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-12 17:59:10 +00:00
Baptiste Coudurier
a4dc7aa5b5
Port libmpcodecs hqdn3d filter.
...
Patch by Baptiste with some fixes by me.
Originally committed as revision 25880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 13:03:42 +00:00
Stefano Sabatini
f8608dcac3
Implement frei0r source.
...
Originally committed as revision 25855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-30 20:14:36 +00:00
Stefano Sabatini
2fb21bf4ff
Give more explicit/less confusing names to the filters dealing with
...
aspect ratio.
Originally committed as revision 25800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-22 22:03:24 +00:00
Stefano Sabatini
63e8d9760f
Use the new libavcore audio channel API.
...
This also allows to remove a linking dependency of libavfilter on
libavcodec.
Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 20:06:22 +00:00
Stefano Sabatini
58935b25d0
Port overlay filter from the libavfilter repo (with many fixes),
...
adopting Baptiste variant which is simpler and faster.
Originally committed as revision 25784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 18:39:34 +00:00
Aurelien Jacobs
0985e1a3ca
move the av_parse_color() function from libavfilter to libavcore
...
Originally committed as revision 25761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-17 22:58:28 +00:00
Stefano Sabatini
5aaea022ab
Make avfiltergraph.h public.
...
Originally committed as revision 25740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-13 09:51:22 +00:00
Stefano Sabatini
6f2325e3f1
1/PHIl: swap again settb/setpts, fix alphabetical order.
...
Originally committed as revision 25657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-02 22:53:18 +00:00
Stefano Sabatini
a532bb390f
Add setpts filter, ported from the libavfilter soc repo.
...
Originally committed as revision 25655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-02 22:29:17 +00:00
Stefano Sabatini
43945b2766
Add transpose filter.
...
Originally committed as revision 25525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-18 21:29:37 +00:00
Stefano Sabatini
68b79bfc48
Implement cropdetect filter.
...
Originally committed as revision 25447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-12 09:22:32 +00:00
Stefano Sabatini
214c0d420b
Implement settb filter.
...
Originally committed as revision 25445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-11 14:00:40 +00:00
Stefano Sabatini
e40032e23a
Add the drawbox filter from the soc libavfilter repo.
...
Pedagogically useful.
Originally committed as revision 25244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 13:16:40 +00:00
Aurelien Jacobs
fa6f4ebc08
use a Makefile in x86 subdir
...
Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:50:26 +00:00
Stefano Sabatini
13fabd7a8d
Port MPlayer blackframe filter.
...
See thread:
Subject: [FFmpeg-devel] [PATCH] Port MPlayer blackframe filter.
Date: Sun, 26 Sep 2010 01:10:40 +0200
Originally committed as revision 25214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 21:36:05 +00:00
Michael Niedermayer
9f27ca3f25
Stefanos port was missing DIRS variable in the Makefile for the newly added x86
...
Originally committed as revision 25199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 17:09:12 +00:00
Michael Niedermayer
acbac56789
yadif filter, based on stefanos port of my yadif from mplayer.
...
Compared to stefanos, 2 frame output works with ffplay.
Originally committed as revision 25196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 16:43:42 +00:00
S.N. Hemanth Meenakshisundaram
f0a5543898
Add asink_anullsink - null audio sink.
...
Patch by "S.N. Hemanth Meenakshisundaram" /smeenaks/ucsd/edu.
Originally committed as revision 25189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 01:57:01 +00:00