Andrey Utkin
5b3265a718
lavfi: install libavfilter/vsrc_buffer.h
...
It declares API necessary for filtering apps.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-12-11 19:14:09 +01:00
Clément Bœsch
cc2355817d
life: add mold, mold_color, life_color and death_color options.
2011-12-11 14:14:01 +01:00
Clément Bœsch
c88d6b18ce
life: add seed information in filter summary.
2011-12-11 13:36:58 +01:00
Stefano Sabatini
6c44ff38d6
lavfi: add cellauto source
2011-12-11 11:55:33 +01:00
Michael Niedermayer
a502939d64
buffersink: Implement a poll function.
...
With this the application can find out how many frames are available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 21:19:23 +01:00
Michael Niedermayer
8e2bab5d4b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
drawtext: remove typo
pcm-mpeg: implement new audio decoding api
w32thread: port fixes to pthread_cond_broadcast() from x264.
doc: add editor configuration section with Vim and Emacs settings
dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
avformat/utils: Drop unused goto label.
doxygen: Replace '\' by '@' in Doxygen markup tags.
cosmetics: drop some completely pointless parentheses
cljr: simplify CLJRContext
drawtext: introduce rand(min, max)
drawtext: introduce explicit draw/hide variable
rtmp: Use nb_invokes for all invoke commands
Conflicts:
libavcodec/mpegvideo.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 00:23:37 +01:00
Luca Barbato
78212cefe1
drawtext: remove typo
...
It slipped through the last two iterations.
2011-12-07 20:40:18 +01:00
Luca Barbato
f5edfc9e92
drawtext: introduce rand(min, max)
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-07 12:11:14 +01:00
Luca Barbato
73585620b8
drawtext: introduce explicit draw/hide variable
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-07 12:11:14 +01:00
Stefano Sabatini
7ecabc8505
vsrc_life: fix comment in parse_rule()
2011-12-06 15:03:51 +01:00
Stefano Sabatini
3af5ddb24b
vf_scale: give a clue in case of invalid expression self-reference
...
Address trac ticket #706 .
2011-12-06 15:03:51 +01:00
Reimar Döffinger
c66bd78e3d
vf_scale: support PAL8 output by producing BGR8.
...
While quality is bad, PAL8 support is needed to allow testing some
encoders that only support PAL8 input.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-05 20:05:44 +01:00
Stefano Sabatini
2f8b6e909d
lavfi: add life source
2011-12-04 21:18:37 +01:00
Stefano Sabatini
6c26fe8b5a
aevalsrc: add duration option
2011-12-04 21:13:22 +01:00
Michael Niedermayer
dda3d716d6
vf_drawtext: support W/H parameters to reduce UI differences to qatar
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 15:29:26 +01:00
Michael Niedermayer
f88d5df383
vf_drawtext: cosmetics to reduce diff to qatar
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 02:27:45 +01:00
Michael Niedermayer
297422b338
vf_drawtext: Add main_w/h to improve compatibility with the modified UI
...
from the fork.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 02:08:56 +01:00
Luca Barbato
2cf74eca70
drawtext: make x and y parametric
...
Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H",
"text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with
vf_overlay and refactor the code accordingly.
2011-12-03 01:35:29 +01:00
Luca Barbato
ec11ff8407
drawtext: manage memory allocation better
...
Call dtext_prepare_text as early as possible
Do not draw if the memory allocation failed
2011-12-03 01:35:28 +01:00
Luca Barbato
a2fb4bcb01
drawtext: refactor draw_text
...
Split the memory allocation from the actual drawing.
2011-12-03 01:35:28 +01:00
Michael Niedermayer
8f025f2f60
avfilter: align allocated images to 32 for AVX and IFF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:53:47 +01:00
Clément Bœsch
c1ae524e2b
avfilter: fix AVFilterPad video only comment.
2011-11-26 19:30:30 +01:00
Stefano Sabatini
28338bc2a3
lavfi: add libass based subtitles renderer
2011-11-26 10:42:33 +01:00
Michael Niedermayer
022f8d27dd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Readd #define _SVID_SOURCE
Fix av_get_channel_layout_string() for positions >31
configure: Store vda lib flags in extralibs instead of ldflags
Make channel layout masks unsigned
dca: ARMv6 optimised decode_blockcode()
nullenc: drop AVFMT_RAWPICTURE from the flags
frame-mt: return consumed packet size in ff_thread_decode_frame
aacdec: add more fate tests covering SBR and PS
MK(BE)TAG: avoid undefined shifts
Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 01:12:08 +01:00
Mans Rullgard
cc276c85d1
Make channel layout masks unsigned
...
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.
Fixes a few invalid shifts.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-25 13:19:54 +00:00
Michael Niedermayer
6d16a96a95
vf_boxblur: fix memleak
...
As the filter uses the default start frame, the cleanup done by the
default end frame is needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 04:45:41 +01:00
Michael Niedermayer
8e576d5830
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libavutil: add utility functions to simplify allocation of audio buffers.
libavutil: add planar sample formats and av_sample_fmt_is_planar()
avconv: fix segfault at EOF with delayed pictures
pcmdec: remove unneeded resetting of samples pointer
avconv: remove a now unused parameter from output_packet().
avconv: formatting fixes in output_packet()
avconv: declare some variables in blocks where they are used
avconv: use the same behavior when decoding audio/video/subs
bethsoftvideo: return proper consumed size for palette packets.
cdg: skip packets that don't contain a cdg command.
crcenc: add flags
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
tiffenc: add a private option for selecting compression algorithm
md5enc: add flags
ARM: remove needless .text/.align directives
Conflicts:
doc/APIchanges
libavcodec/tiffenc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/ref/fate/bethsoft-vid
tests/ref/fate/cdgraphics
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/nuv
tests/ref/fate/tiertex-seq
tests/ref/fate/tscc-32bit
tests/ref/fate/vmnc-32bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 03:32:24 +01:00
Michael Niedermayer
656911d84d
vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be used uninitialized in this function [-Wuninitialized]
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 00:08:05 +01:00
Michael Niedermayer
248bb81ebc
avfilter: Error out from avfilter_merge_formats() when there are duplicates
...
instead of trying to continue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 14:14:01 +01:00
Michael Niedermayer
4d874fc2b1
vf_mp: rewrite vf_mp filter warning message
...
Warning text by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 13:22:46 +01:00
Michael Niedermayer
8cda755c2f
avfilter: dont write out of array for duplicate formats in avfilter_merge_formats()
...
Note, this is a theoretical fix, iam not aware of a case where this function receives
duplicates in its input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 13:18:11 +01:00
Michael Niedermayer
78317881f0
graphparser: Fix doxy on avfilter_graph_parse() return value.
...
Found-by: ZacS123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22 15:09:26 +01:00
Clément Bœsch
2f0f9a87d0
Fix various if parenthesis misplacements.
2011-11-21 19:35:33 +01:00
Michael Niedermayer
2c44aed82a
vsrc_mandelbrot: fix inner=period, the previous optimizations broke it.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 04:16:41 +01:00
Michael Niedermayer
90c02ae142
vsrc_mandelbrot: increase maxiter to 7189
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 23:52:29 +01:00
Michael Niedermayer
690860d0d5
vsrc_mandelbrot: Use threshold to detect cycles.
...
This way cycles are detected much earlier.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 23:28:56 +01:00
Michael Niedermayer
a5dfedd381
vsrc_mandelbrot: detect edges in interpol()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 22:22:21 +01:00
Michael Niedermayer
4ebbcdb3eb
vsrc_mandelbrot: avoid a | in interpol()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 22:11:53 +01:00
Michael Niedermayer
5dd16af6b5
vsrc_mandelbrot: increase default zoom speed by a factor of 2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 19:42:24 +01:00
Michael Niedermayer
ca14808275
vsrc_mandelbrot: spatial interpolation
...
speeds the code up by a factor of about 2-3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 19:41:28 +01:00
Michael Niedermayer
56fc4cf04f
vsrc_mandelbrot: always store values for periodicity checking, this avoids a few checks.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 15:02:34 +01:00
Michael Niedermayer
da1344e0cd
vsrc_mandelbrot: simplify second bailout search by not recalculating values.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 15:00:26 +01:00
Michael Niedermayer
e749b3780c
vsrc_mandelbrot: increase zyklus array size so that optimizations can write a bit more.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 14:16:53 +01:00
Michael Niedermayer
649d3932db
vsrc_mandelbrot: check bailout only once every 8 iterations, this is around 10% faster.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 14:15:56 +01:00
Michael Niedermayer
fe2efc5264
vsrc_mandelbrot: factorize periodicity checking too.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 13:55:51 +01:00
Michael Niedermayer
cf670fbc96
vsrc_mandelbrot: factorize main calculation out into a macro.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 13:51:44 +01:00
Clément Bœsch
1fbf7165d5
lavfi: reimplement MPlayer's af_pan filter for libavfilter.
...
Original code by Clément Bœsch.
Parameters parsing and misc enhancements by Nicolas George.
2011-11-18 19:39:26 +01:00
Michael Niedermayer
32aa9590ac
vf_scale: Fix slice position assert to take vertical subsampling into account.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 22:39:46 +01:00
Michael Niedermayer
974d25e2db
mandelbrot: make mincol description and code match.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 15:13:01 +01:00
Clément Bœsch
16b809ce8e
lavfi: fix misc typo in avfilter.h header.
2011-11-16 09:53:58 +01:00
Clément Bœsch
4da45aff28
cleanup: remove various double end ';' all over the code.
2011-11-16 07:48:23 +01:00
Michael Niedermayer
04bb26e3ee
mandelbrot: add dither to convergence & mincol colorings.
...
This avoids banding artifacts.
Note, low end TFTs still show some banding.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 21:33:11 +01:00
Michael Niedermayer
7575980ba4
mandelbrot: make mincol the default.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 20:04:25 +01:00
Michael Niedermayer
8d51cb4fb8
mandelbrot: add mincol inner coloring method.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 20:04:25 +01:00
Michael Niedermayer
5a68b1ac3b
mandelbrot: add inner drawing method to show converence time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 17:26:51 +01:00
Michael Niedermayer
5582e557e6
mandelbrot: add "fractal" to the description
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 17:26:46 +01:00
Michael Niedermayer
4c52adad69
mandelbrot: Fix "warning: passing argument 2 of ‘draw_mandelbrot’ from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 17:26:41 +01:00
Stefano Sabatini
2b1a4c5b34
amovie: avoid crash in amovie_request_frame() if no samplesref is available
...
The crash occurrs when a frame is successfully decoded, but no decoded
data is immediately available (typically happens with ogg/vorbis).
2011-11-15 00:10:15 +01:00
Michael Niedermayer
73af8ea356
mandelbrot: add math.h for log2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:56:03 +01:00
Michael Niedermayer
70eb58cd92
mandelbrot: avoid INFINITY as openbsd seems not to like it.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:47:56 +01:00
Michael Niedermayer
b1b0fd2790
pad: fix format string length
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:42:10 +01:00
Stefano Sabatini
3a9f2f1d65
vsrc_mandelbrot: set options through the opt framework
2011-11-13 21:31:23 +01:00
Giorgio Vazzana
c15400afc5
mandelbrot: remove always-false condition in fill_from_cache
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 19:41:21 +01:00
Michael Niedermayer
08dadd331f
mandelbrot: allow visualizing the period of converged points.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 19:28:24 +01:00
Michael Niedermayer
e8499ab171
mandelbrot: Add inner variable & enum for inner coloring schemes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 19:26:22 +01:00
Michael Niedermayer
3cbe9afba5
mandelbrot: only check bailout once every 2 iterations.
...
Once we bailed out we calculate the exact iteration in which it would have happened if needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 18:14:40 +01:00
Michael Niedermayer
41fd1b2d5a
mandelbrot: add SQR() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 18:14:10 +01:00
Giorgio Vazzana
e555119c73
mandelbrot: correct and simplify the formula used in NORMALIZED_ITERATION_COUNT
...
Use log(sqrt(mb->bailout)) instead of log(mb->bailout) because mb->bailout represent
the bailout radius squared, and then simplify the two sqrt().
This is also slightly faster.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:33:09 +01:00
Michael Niedermayer
88166fc579
mandelbrot: unroll the innermost loop once.
...
This allows us to remove a if() and a variable assignment.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:01:56 +01:00
Michael Niedermayer
1d06608732
mandelbrot: only check periodicity once for each period instead of twice.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:01:56 +01:00
Michael Niedermayer
2fee131b9e
mandelbrot: use period detection depening on left pixel and not the
...
previous calculated pixel, this is more accurate due to the last
calculated often being farther away.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:01:56 +01:00
Giorgio Vazzana
be97e7b9c2
mandelbrot: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 01:27:30 +01:00
Giorgio Vazzana
459bba58d2
mandelbrot: add missing options to the parsing code
...
The following options were added: end_scale, end_pts, bailout, outer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 01:27:30 +01:00
Giorgio Vazzana
6024bdb21a
mandelbrot: fix sscanf format string
...
Replace ',' with ':'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 21:00:12 +01:00
Michael Niedermayer
32dd67162a
mandelbrot: Print a note if the cache is too small
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 17:05:11 +01:00
Michael Niedermayer
905202ef6e
mandelbrot: increase cache size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 17:04:50 +01:00
Michael Niedermayer
fd8d03457a
mandelbrot: increase resolution, and decrease zoom speed to maintain the cpu requirement.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 17:04:08 +01:00
Michael Niedermayer
40d6e30c55
mandelbrot: increase default maxiter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:46:41 +01:00
Michael Niedermayer
6c5dd858b4
mandelbrot: Only use cycle detection if previous pixel was an interior pixel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:46:21 +01:00
Michael Niedermayer
50b8f9388a
mandelbrot: detect cycles to speed up interior rendering.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:46:16 +01:00
Michael Niedermayer
3de934c873
mandelbrot: increase default maxiter to 1024
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:44:53 +01:00
Michael Niedermayer
07f272bdbb
mandelbrot: use cache to avoid recalculating points.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:44:53 +01:00
Michael Niedermayer
8ca891fc1a
mandelbrot: more interresting zoom coordinates borrowed from wikipedia.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:44:53 +01:00
Michael Niedermayer
ddeb194b14
mandelbrot: add a end_scale and pts so we can zoom in.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:16 +01:00
Michael Niedermayer
dece017280
mandelbrot: center coordinate reference on the images center
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:15 +01:00
Michael Niedermayer
aa198ad679
mandelbrot: make 2 variables const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:15 +01:00
Michael Niedermayer
0e5b05134b
mandelbrot: fix typo that led to hardcoded max iteration count.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:15 +01:00
Michael Niedermayer
4ccd898af2
mandelbrot: support different outer coloring methods.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 23:22:04 +01:00
Michael Niedermayer
75e309160b
mandelbrot: make bailout a variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 23:21:42 +01:00
Michael Niedermayer
847e61de4a
avfilter: bump minor for mandelbrot
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 23:20:25 +01:00
Michael Niedermayer
658d166da0
avfilter: add mandelbrot fraktal source
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 22:47:06 +01:00
Michael Niedermayer
393b234fa1
yadif, its 2011
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 17:06:47 +01:00
Michael Niedermayer
825481e87b
yadif: reject reuse2 buffers as we cant use frames that change under our
...
fingers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 17:06:07 +01:00
Stefano Sabatini
dec354ba1d
vf_fade: reindent after previous commit
2011-11-10 01:31:28 +01:00
Mark Himsley
8c1fb50d07
vf_fade: add alpha option and alpha fading support
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-10 01:31:13 +01:00
Mark Himsley
0d602615ab
vf_fade: add support to options parsing
...
Extend fade syntax, required by a pending patch.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-10 01:28:31 +01:00
Nicolas George
68b531fe6a
src_movie: set the channel layout to default if the codec did not set it.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06 01:19:56 +01:00
Reimar Döffinger
5af7daabc4
Mark AVFilterPad[] compound literals as const.
...
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>
2011-11-06 00:05:14 +01:00
Reimar Döffinger
b052601b95
Make another static array const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
6f6ab1d9f3
Make another PixelFormat list const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
d7e95ccd9f
Make PIX_FMT format list arrays const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
d78473334e
Add const to static arrays where it was forgotten.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:01 +01:00
Ronald S. Bultje
43317fd52c
libavfilter: reindent.
2011-11-05 07:01:39 -07:00
Ronald S. Bultje
23a8b4ddfc
avfilter: don't abort() on zero-size allocations.
2011-11-05 06:59:27 -07:00
Michael Niedermayer
c28ea94cd7
af_volume: exp10() is a GNU extension.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05 05:39:42 +01:00
Stefano Sabatini
3a1045dfda
af_earwax: copy input buffer properties to output
...
In particular, fix timestamps, partially address trac ticket #375 .
2011-11-05 02:45:08 +01:00
Mina Nagy Zaki
fa4f06ab5e
lavfi: add earwax audio filter, ported from Sox
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-05 02:16:45 +01:00
Stefano Sabatini
618ac71354
lavfi: add volume filter
2011-11-05 02:13:37 +01:00
Stefano Sabatini
1fc7077115
lavfi: increase number of maximum registered filters from 64 to 128
2011-11-05 02:13:37 +01:00
Stefano Sabatini
217790871e
lavfi: issue error if maximum number of filters is reached
...
Issue an error and return a more meaningful error code in case the
maximum number of registered filters has been reached.
This is better than silently ignore the error, improve feedback.
2011-11-05 02:13:37 +01:00
Michael Niedermayer
259a960f1b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vp6: Fix illegal read.
avfilter: Don't copy garbage from the stack when setting up video pictures.
avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
avcodec: Remove a misplaced and useless attribute_deprecated
avconv: add -dump_attachment option.
avconv: add -attach option.
avconv: make negative mappings disable only streams from the specified file
fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64
Conflicts:
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 01:44:06 +01:00
Alex Converse
0d7a16a946
avfilter: Don't copy garbage from the stack when setting up video pictures.
2011-11-03 15:54:04 -07:00
Reimar Döffinger
96949dafcc
Replace all strcasecmp/strncasecmp usages.
...
All current usages of it are incompatible with localization.
For example strcasecmp("i", "I") != 0 is possible, but would
break many of the places where it is used.
Instead use our own implementations that always treat the data
as ASCII.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-03 19:25:26 +01:00
Michael Niedermayer
988f585fcb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (44 commits)
replacement Indeo 3 decoder
gsm demuxer: do not allocate packet twice.
flvenc: use first packet delay as global delay.
ac3enc: doxygen update.
imc: return error codes instead of 0 for error conditions.
imc: return meaningful error codes instead of -1
imc: do not set channel layout for stereo
imc: validate channel count
imc: check for ff_fft_init() failure
imc: check output buffer size before decoding
imc: use DSPContext.bswap16_buf() to byte-swap packet data
rtsp: add allowed_media_types option
libgsm: add flush function to reset the decoder state when seeking
libgsm: simplify decoding by using a loop
gsm: log error message when packet is too small
libgsmdec: do not needlessly set *data_size to 0
gsmdec: do not needlessly set *data_size to 0
gsmdec: add flush function to reset the decoder state when seeking
libgsmdec: check output buffer size before decoding
gsmdec: log error message when output buffer is too small.
...
Conflicts:
Changelog
ffplay.c
libavcodec/indeo3.c
libavcodec/mjpeg_parser.c
libavcodec/vp3.c
libavformat/cutils.c
libavformat/id3v2.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03 02:16:26 +01:00
Stefano Sabatini
0b3e9d5dc6
vf_overlay: adopts FAST_DIV255 macro for calculating destination alpha
...
Ease readability, improve exactness.
2011-11-02 21:44:13 +01:00
Mark Himsley
91dfb73852
vf_fade: fade to correct CCIR601/709 black level
...
Current implementation fades to 0. This implementation fades to 16 for
YUV formats that contain CCIR601/709 video levels. RGB and YUVJ
formats are not altered.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-02 21:44:13 +01:00
Diego Biurrun
959cfbf3f4
vsrc_testsrc: fix mailing list reference URL
2011-11-02 10:42:55 +01:00
Diego Biurrun
124e28847b
Remove some stray unnecessary ffmpeg references.
2011-11-02 10:42:54 +01:00
Michael Niedermayer
3fd0f6ed25
vf_transpose: remove pix_fmts which can currently not be supported.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 23:45:28 +01:00
Stefano Sabatini
30647fb45a
lavfi: bump micro after recent changes in the overlay filter
2011-10-31 11:19:53 +01:00
Stefano Sabatini
2f7c8aefa8
vf_overlay: add support to alpha pre-multiplication in the RGBA path
...
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
2011-10-31 11:06:31 +01:00
Stefano Sabatini
3013bfa81e
vf_overlay: enable RGB path
...
Add option rgb which forces the RGB path.
2011-10-31 11:06:19 +01:00
Stefano Sabatini
b54c0a552d
vf_overlay: use opt.h API for setting options
...
Extend syntax, allow to easily add more options later.
2011-10-30 21:10:54 +01:00
Stefano Sabatini
8dc90371b1
lavfi: add internal function ff_fill_rgba_map()
2011-10-28 02:06:50 +02:00
Clément Bœsch
9bd23f6815
ashowinfo: fix typo in description.
2011-10-27 22:16:24 +02:00
Clément Bœsch
a0b7853f7a
vf_showinfo: print checksums in hexadecimal.
2011-10-27 22:14:57 +02:00
Michael Niedermayer
3e4375833d
vf_scale: Request an aligned buffer.
...
Fixes Ticket594
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 03:46:50 +02:00
Michael Niedermayer
d7dcd96a23
vf_pad: Fix alignment of get_video_buffer()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 03:46:09 +02:00
Michael Niedermayer
d18fd13f30
avfilter: add named constamt to indicate the amount of alignment that AV_PERM_ALIGN means.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 03:45:02 +02:00
Michael Niedermayer
4d34b6c1a1
avfilter: add flag to indicate that alignment is needed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 03:44:41 +02:00
Mark Himsley
9f9b2ab1b1
vsrc_testsrc: fix off-by-one logic when detecting the EOF time in request_frame()
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-10-25 23:38:56 +02:00
Mark Himsley
1ca1336067
testsrc seconds display is out-by-one frame
...
Without this patch each displayed second is incremented 1 frame early,
second 0 is only 24 frames long where as every other second is 25 frames
long.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-25 18:24:25 +02:00
Stefano Sabatini
d9d492513d
vsrc_testsrc: increase log level from DEBUG to INFO for message in init()
2011-10-24 17:47:59 +02:00
Stefano Sabatini
1f4652068e
lavfi: rewrite nullsrc using the code in vsrc_testsrc.c
...
Factorize code, extend the functionality of the filter, and make it
return empty buffers. This is useful for filters which ignore the input
frames content.
This is also changing the syntax of the nullsrc source, and dropping the
framerate expression evaluation, which does not look particularly useful.
2011-10-24 17:46:48 +02:00
Stefano Sabatini
42d44ec306
vsrc_testsrc: do not assume non-padded lines in test_fill_picture()
...
In particular, fix sliding color bar with padded data, for example with
testsrc,pad=iw+200:ih.
2011-10-23 23:54:37 +02:00
Stefano Sabatini
1679a40b74
vf_boxblur: fix slice-drawing
...
This filter does not support slice-drawing, the whole blurred image needs
to be written in end_frame().
2011-10-23 23:54:37 +02:00
Stefano Sabatini
43fce2214b
lavfi: add missing header mulitple-inclusion guard in transform.h
2011-10-20 15:59:20 +02:00
Stefano Sabatini
99d48b07d1
lavfi/transform.h: apply misc doxy cosmetical changes
2011-10-20 15:59:12 +02:00
Michael Niedermayer
d0492578c8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
presets: rename presets directory
lavc: make avcodec_get_context_defaults3 "officially" public
lavf: replace av_new_stream->avformat_new_stream part II.
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
lavf: add avformat_new_stream as a replacement for av_new_stream.
Use correct scaling table for bwd-pred MVs in second B-field
Ut Video decoder
Makefile: change presets extension to .avpreset
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
lavfi: add testsrc source
AVOptions: add documentation.
presets: update libx264 ffpresets
Conflicts:
Changelog
doc/APIchanges
doc/ffmpeg.texi
ffpresets/libx264-ipod320.ffpreset
ffpresets/libx264-ipod640.ffpreset
ffserver.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavdevice/libdc1394.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/flvdec.c
libavformat/riff.c
libavformat/version.h
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20 02:34:51 +02:00
Paul Flinders
9ef714328c
deshake: limit deshake to specific area to search for motion vectors.
2011-10-20 00:39:34 +02:00
Stefano Sabatini
ec2ac9271c
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
...
The licence was changed from GPL to LGPL with explicit approval from
the original author.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: add rgbtestsrc source,
ported from MPlayer libmpcodecs
Date: Mon, 11 Jul 2011 16:32:41 +0200
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-10-19 07:09:08 +02:00
Stefano Sabatini
0244879f30
lavfi: add testsrc source
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-10-19 07:08:42 +02:00
Michael Niedermayer
35674a29b7
vf_mp: Fix several incompatible pointer type warnings.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19 00:05:30 +02:00
Michael Niedermayer
cb3034e0d1
vf_unsharp: Fix false ‘src2’ may be used uninitialized in this function warning.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19 00:04:33 +02:00
Michael Niedermayer
e73cc2819e
src_movie: Fix incompatible pointer type warning.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19 00:03:56 +02:00
Michael Niedermayer
5ed20cfeaf
vf_deshake: Fix cast discards qualifiers from pointer target type warning.
...
And simplify the code in the process.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19 00:03:13 +02:00
Michael Niedermayer
e96aa8d1a0
vf_pixdesctest: Fix incompatible pointer type warning.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-18 23:59:59 +02:00
Michael Niedermayer
abe9c54f14
yadif: Fix assignment from incompatible pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-18 23:59:20 +02:00
Michael Niedermayer
2982b02b79
vsrc_buffer: FIx incompatible pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-18 23:58:41 +02:00
Stefano Sabatini
2b72067406
asrc_aevalsrc: apply misc cleanup in the options array
...
Prefer AV_OPT_* over FF_OPT, vertically align fields.
2011-10-18 18:52:50 +02:00