virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
59,505 Commits 37 Branches 400 Tags 460 MiB
3cf1503beb
Commit Graph

4114 Commits

Author SHA1 Message Date
Paul B Mahol
191ee4aefb avfilter/af_ladspa: set output channel layout for passthrough case 
For cases when plugin does not return any samples we just return
input samples. Previously channel layout for outlink was not set.
Set it explicitly instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:51:08 +00:00
Paul B Mahol
110a2f446d avfilter/af_ladspa: allow changing controls dynamically 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:49:55 +00:00
Paul B Mahol
4d86a945df avfilter/af_ladspa: refactor code setting input control ports values 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:49:54 +00:00
Nicolas George
231e50157c lavfi/dualinput: reimplement on top of framesync. 2013-09-23 09:50:09 +02:00
Nicolas George
53319d5c93 lavfi: add an API to synchronize multiple video inputs. 
Compared to dualinput, this API can handle more than two
inputs and can generate frames synchronized to any or all
input streams.
 2013-09-23 09:49:37 +02:00
Paul B Mahol
601eab2bbf avfilter: add ladspa wrapper filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 16:36:10 +00:00
Michael Niedermayer
4bc7a2a64b avfilter: remove duplicate includes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-21 15:36:33 +02:00
Paul B Mahol
59d72f8b16 lavfi/pad,crop,scale: remove options description from filter description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-21 12:50:02 +00:00
Paul B Mahol
8ac0eb2cd7 avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-21 12:48:24 +00:00
Michael Niedermayer
68f328fcdd avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-21 03:11:02 +02:00
Neil Birkbeck
a11c16a0b0 avfilter/vf_psnr: Prevent integer overflow. 
The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-21 03:10:45 +02:00
Paul B Mahol
20101f4a83 avfilter/vf_decimate: add gray16 and yuv440p 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 17:53:05 +00:00
Paul B Mahol
0ad5ef674b avfilter/vf_decimate: fix crash with gray8 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 17:50:42 +00:00
Paul B Mahol
390c35a13b lavfi/mp: remove mp=qp 
The filter does nothing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 15:53:45 +00:00
Paul B Mahol
2e35686030 avfilter/vf_telecine: remove redudant av_frame_copy_props() 
It is already called by av_frame_clone().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 19:17:34 +00:00
Paul B Mahol
7f4a5006ce avfilter/vf_pullup: remove junk_down nonsense 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 12:47:57 +00:00
Paul B Mahol
d520055000 avfilter/vf_pullup: change log level to error 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:56:36 +00:00
Paul B Mahol
fe5b7612c0 avfilter/vf_pullup: fix memleak of metrics for last PullupField 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:56:35 +00:00
Paul B Mahol
394a73cad2 avfilter/vf_pullup: make sure metric_plane is available 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:27:41 +00:00
Paul B Mahol
8302abf844 lavfi/mp: remove mp=pullup 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:05:27 +00:00
Paul B Mahol
112017e990 avfilter/x86/vf_pullup: try to fix build on x64 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-17 17:20:58 +00:00
Paul B Mahol
9c774459a9 avfilter: port pullup filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-17 17:03:36 +00:00
Paul B Mahol
9d05de2258 avfilter: add adelay filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 14:33:07 +00: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
7ac6c6325e libavfilter/libmpcodecs: remove unused files 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 21:43:04 +00:00
Paul B Mahol
24678a61d9 avfilter/vf_gradfun: use av_calloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 19:07:02 +00:00
Paul B Mahol
693747c3d0 avfilter/vsrc_life: use av_calloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 19:07:01 +00:00
Michael Niedermayer
3dfc5f551f avfilter: avoid testing float == 0 
This fixes the hypothetical case of rounding errors causing
incorrect values to be used.
We do not use *_EPSILON, because non trivial expressions can contain
errors larger than that making a zero equality test with *_EPSILON
unreliable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-15 15:33:39 +02:00
Paul B Mahol
60abdb6c17 avfilter/af_aecho & af_compand: use extended_data 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 12:10:12 +00:00
Paul B Mahol
211a185cba avfilter/avfilter: check allocation failure in ff_insert_pad() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 11:09:23 +00:00
Paul B Mahol
7d8939a0ff avfilter/avf_avectorscope: improve description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-14 12:11:22 +00:00
Paul B Mahol
b8b398027c avfilter/video: remove commented out cruft 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-13 19:17:56 +00:00
Michael Niedermayer
126ba68826 avfilter/vf_noise: rename linesize to bytewidth 
Its the width in bytes and not the linesize or stride.
This makes the naming more consistent with the rest of the codebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 11:51:37 +02:00
Michael Niedermayer
53102fa2f0 Revert "avfilter/vf_noise: dont corrupt the picture outside width x height" 
This reverts commit 51dab60c7b.

this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.

Found-by: durandal_1707
 2013-09-13 11:51:37 +02:00
Georg Martius
ad96482d67 avfilter/vidstabtransform: allow negative zoom. 
This is useful in addition to crop=black.

Signed-off-by: Clément Bœsch <clement@stupeflix.com>
 2013-09-13 11:46:44 +02:00
Michael Niedermayer
51dab60c7b avfilter/vf_noise: dont corrupt the picture outside width x height 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:14:54 +02:00
Paul B Mahol
3eba83daed avfilter/vf_noise: unbreak filter when inline assembly is not present 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:54:10 +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
a8e00cf926 avfilter: remove redundant use of AV_NE() macro 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-11 15:05:21 +00:00
Paul B Mahol
99a283331c avfilter/vf_traspose: move switch out of loop 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-11 15:02:08 +00:00
Paul B Mahol
bf5ceeffc3 avfilter/vf_psnr: >8 bit planar support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-10 16:45:48 +00:00
Michael Niedermayer
bb23bf8fd7 avfilter/avfilter: fix null pointer dereference with queued ping filters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 13:39:57 +02:00
Paul B Mahol
0227b42926 avfilter/vf_psnr: refactor subsampled format support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 12:01:44 +00:00
Paul B Mahol
ffde17e70f avfilter/vf_histeq: remove unused item from filter private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 21:04:12 +00:00
Paul B Mahol
4cf1900ba7 avfilter/vf_format: add .get_video_buffer back 
Unbreak xyz12 with vflip.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 20:37:48 +00:00
Paul B Mahol
d2382903d6 avfilter/vf_rotate: fix 'oh' option description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 18:35:26 +00:00
Paul B Mahol
b077d8d908 avfilter: remove redundant .get_(audio/video)_buffer initializations 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 18:20:16 +00:00
Paul B Mahol
5a16a1d508 avfilter/af_asetnsamples: remove .needs_writable as it is not required 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 12:15:46 +00:00
Michael Niedermayer
64c54f8333 avfilter/af_compand: silence "maybe uninitialized" warnings 
if channels is 0 it actually would be uninitialized, thus an assert with comment is added

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 03:49:01 +02:00
Michael Niedermayer
797762fcf3 avfilter/af_aecho: silence "maybe uninitialized warning" 
if channels is 0 it actually would be uninitialized, thus an assert with comment is added

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 03:48:07 +02:00
Paul B Mahol
50b90d5e0b lavfi/telecine: remove bitstream and pal formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 18:45:27 +00:00
Paul B Mahol
6770fa4df8 lavfi/fieldorder: work with non writtable frames too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 18:34:37 +00:00
Paul B Mahol
33dacda40b lavfi/fieldorder: remove pal8 format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 18:34:37 +00:00
Paul B Mahol
86cb986ce1 lavfi/fieldorder: add timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:45:31 +00:00
Paul B Mahol
df7e3572c3 lavfi/fieldorder: use av_image_fill_linesizes() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:45:31 +00:00
Paul B Mahol
9b35bee696 lavfi/fieldorder: remove redundant get_video_buffer() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:45:31 +00:00
Paul B Mahol
898c6191ff lavfi: Weston 3 Field Deinterlacing Filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 12:46:56 +00:00
Paul B Mahol
d2e237338d lavfi/mp: remove mp=fil 
The filter does not work correctly most of time.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:22:47 +00:00
Paul B Mahol
0a8bb91505 lavfi/mp: remove mp=dint 
There are better and actually maintained filters that have similar
functionality.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:03:36 +00:00
Michael Niedermayer
59b9ecc92a avfilter/vf_yadif: Treat mode as a field of flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 20:53:12 +02:00
Michael Niedermayer
4ff5b2683c avfilter/vf_yadif: fix "incompatible pointer type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 19:58:45 +02:00
Michael Niedermayer
a67dcd74ab avfilter/vf_yadif: add gbr(a)p support 
Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 14:06:17 +02:00
Paul B Mahol
d21e496cf5 lavfi/mptestsrc: use outlink->frame_count 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 20:15:46 +00:00
Clément Bœsch
30d40c9e86 lavfi/drawtext: add generic timeline interface and deprecate "draw". 2013-09-03 21:12:15 +02:00
Clément Bœsch
493ebbd7eb Update copyrights where my email appears with the new one. 2013-09-03 20:42:24 +02:00
Paul B Mahol
771e2e59e2 lavfi/hue: relicense to LGPL with permission by all contributors 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 17:21:06 +00:00
Paul B Mahol
916549cb1e lavfi/mp: remove mp=phase 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 14:05:38 +00:00
Paul B Mahol
3dd4b6ea41 lavfi: port phase filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 14:05:38 +00:00
Michael Niedermayer
92b7e7b318 avfilter/vf_yadif: reallocate frames if strides differ 
Fixes Ticket2896

An alternative to this would be to change the code to support any
stride.
The condition of differing strides should be rare.
If theres no speedloss supporting any stride would be better

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 05:14:29 +02:00
Michael Niedermayer
cdd5df8189 avfilter/vf_fps: make sure the fifo is not empty before using it 
Fixes Ticket2905

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-02 04:32:23 +02:00
Michael Niedermayer
67d7ea9825 Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce' 
* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
  vf_lut: Constantize

Conflicts:
	libavfilter/vf_lut.c

See: d7e95ccd9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:10:07 +02:00
Diego Elio Pettenò
faa8245bd4 vf_lut: Constantize 
The pixel format tables are never modified, mark them as constant.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-31 16:13:42 +02:00
Thilo Borgmann
d814a839ac Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
Michael Niedermayer
8b79a458c0 avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 13:12:09 +02:00
Michael Niedermayer
88262e1c1d Merge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93' 
* commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93':
  vf_fps: use double constants for default/min/max for start_time

Conflicts:
	libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 13:02:28 +02:00
Hendrik Leppkes
cb8f70c96e vf_fps: use double constants for default/min/max for start_time 
When using AV_NOPTS_VALUE (which expands to INT64_C(0x8000000000000000))
as union initializer for a double field, the c99 converter needs to
interpret this constant when filling the union initializer, and it is
interpreted as a positive value.

When converting AV_NOPTS_VALUE to a double, MSVC 2010 ends up with
the same positive value as the c99 converter, while MSVC 2012 gets
a negative value.

This results in an infite loop in various FATE tests on MSVC 2012.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-28 17:54:47 +03:00
Vittorio Giovara
0ce1a7598e vf_interlace: fix file permissions 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-27 23:50:45 +02:00
Pavel Koshevoy
185fc52f19 avfilter/vf_fps: Work around msvc (c99wrap) build failure 
c99wrap choked on initialization of .dbl start_time option with
AV_NOPTS_VALUE: Unable to parse int64_t as expression primary

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 15:23:45 +02:00
Michael Niedermayer
1350a5c4d5 avfilter/graphparser: fix use of deprecated symbols 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-25 19:36:58 +02:00
Michael Niedermayer
7659ee350b avfilter/graphdump: fix use of deprecated symbols 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-25 19:33:44 +02:00
Michael Niedermayer
f12174c8ce avfilter/filtfmts: fix use of deprecated symbols 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-25 19:33:44 +02:00
Paul B Mahol
8fbf940e16 lavfi/tile: do not leak input frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-23 10:28:29 +00:00
Paul B Mahol
b1e276f8df lavfi/hue: allow changing brightness 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-22 14:56:13 +00:00
Paul B Mahol
139a98be8e lavfi/gradfun: support gbrp 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-22 10:59:52 +00:00
Paul B Mahol
e7834d29f2 lavfi/separatefields: fix frame leak 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 20:02:25 +00:00
Paul B Mahol
e6876c7b7b lavfi/hue: use lookup tables 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 15:33:33 +00:00
Michael Niedermayer
b69b075ac6 Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508' 
* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
  vf_fps: add 'start_time' option

Conflicts:
	doc/filters.texi
	libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 11:37:10 +02:00
Justin Ruggles
545a0b807c vf_fps: add 'start_time' option 
This allows for dropping or duplication to match a particular start time.
 2013-08-20 14:10:02 -04:00
Michael Niedermayer
cbdf4d6a61 avfilter/vf_mp: remove unused sws related functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 16:07:29 +02:00
Michael Niedermayer
247fa6c27c avfilter: remove ff_copy_int*_list 
The functions are unused

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 16:07:29 +02:00
Paul B Mahol
66f1de66b8 lavfi/transpose: call av_frame_copy_props() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-16 12:40:02 +00:00
Paul B Mahol
e74a5acb40 lavfi/transpose: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-16 12:40:02 +00:00
Paul B Mahol
ef6718a5f7 lavfi/tile: make color of blank/unused area configurable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-16 12:40:01 +00:00
Michael Niedermayer
ec0e0eb4c1 avfilter/vf_scale+aresample: minor simpification 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 04:26:59 +02:00
Michael Niedermayer
6d246f440e avfilter/vf_scale: generic swscale option support 
With this all AVOptions from swscale can be set without each needing
changes to vf_scale.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 23:23:58 +02:00
Paul B Mahol
11afe28b9a lavfi/ebur128: fix typo: s/negociation/negotiation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-13 12:43:56 +00:00
Paul B Mahol
9087dcbe5b lavfi/trim: check for right default value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-12 10:56:52 +00:00
Thilo Borgmann
f18ccb529f Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
Michael Niedermayer
0b5627189d avfilter/f_sendcmd: make const arrays static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 18:44:39 +02:00
Michael Niedermayer
c9837613ed avfilter/trim: Fix assertion failure with empty frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 11:54:40 +02:00
Michael Niedermayer
190a5893d1 avfilter/fifo: explicitly assert that a frame should have become available after request 
May help tools like coverity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 09:28:11 +02:00
Michael Niedermayer
3b2e99fe9e avfilter/vf_perspective: factor u cliping code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 00:03:43 +02:00
Michael Niedermayer
bb5ef96164 Merge commit '3799376dd3373ee255651ed542c75b15665801a8' 
* commit '3799376dd3373ee255651ed542c75b15665801a8':
  lavfi/fifo: fix flushing when using request_samples

Conflicts:
	libavfilter/fifo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 09:35:03 +02:00
Anton Khirnov
3799376dd3 lavfi/fifo: fix flushing when using request_samples 
If any samples are still buffered when request_frame returns EOF, they
won't be returned currently.
 2013-08-05 10:52:00 +02:00
Michael Niedermayer
46b3dbf9ca Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26' 
* commit '77cc958f60f73963be4281d6e82ef81707e40c26':
  lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:22:18 +02:00
Anton Khirnov
77cc958f60 lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter() 
This function should never modify the filter.
 2013-08-04 15:46:19 +02:00
Timothy Gu
3415058541 vf_scale: add force_original_aspect_ratio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 13:27:01 +02:00
Michael Niedermayer
61af627d56 avfilter/graphparser: remove 256 char limit from create_filter() 
Fixes Ticket2803

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 00:56:55 +02:00
Michael Niedermayer
e43a0a232d avfilter: fix plane validity checks 
Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 19:15:46 +02:00
Michael Niedermayer
20be5e0a0e Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91' 
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
	libavcodec/avpacket.c
	libavcodec/pthread.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:08:30 +02:00
Michael Niedermayer
a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:16:36 +02:00
Diego Biurrun
7950e519bb Disable deprecation warnings for cases where a replacement is available 2013-08-02 19:19:02 +02:00
Diego Biurrun
b5a138652f Give less generic names to global library option arrays 2013-08-02 19:19:02 +02:00
Michael Niedermayer
0c8efe4891 Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f' 
* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
	libavfilter/buffer.c
	libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:36:54 +02:00
Diego Biurrun
45dd1ae1b3 avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs 2013-07-31 19:23:00 +02:00
Michael Niedermayer
1bbf94d84f avfilter/af_compand: %f is for printing doubles 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 22:24:42 +02:00
Michael Niedermayer
c7d1717957 Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
  avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

Conflicts:
	doc/general.texi
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 11:26:39 +02:00
Paul B Mahol
6b68e2a43b lavfi: add compand filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-29 19:11:50 +00:00
Diego Biurrun
0e8c6f221a avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo 
Also fix some similar typos in comments and documentation.
 2013-07-29 20:09:59 +02:00
Michael Niedermayer
b0edd59994 Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:44:34 +02:00
Michael Niedermayer
edab63a406 Merge commit '966689442ed843019dc0722a49bfb0ac51755d19' 
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 11:26:57 +02:00
Diego Biurrun
bf4b0ed1d5 Add missing deprecation attributes 2013-07-27 16:08:49 +02:00
Diego Biurrun
966689442e buffersink: K&R formatting cosmetics 2013-07-27 10:47:38 +02:00
Michael Niedermayer
8720d3ac21 avfilter/vf_scale: set in_color_matrix default to "auto" 2013-07-27 01:16:07 +02:00
Michael Niedermayer
f3f4e133d6 avfilter/vf_scale: use sws_getCoefficients() 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 23:07:19 +02:00
Paul B Mahol
be7d6710b4 lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 17:16:26 +00:00
Hendrik Leppkes
779e6c2b98 lavfi: add attribute_align_arg to all public entry points 
Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-26 19:51:04 +03:00
Paul B Mahol
7ac736afbd lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:24:55 +00:00
Paul B Mahol
a4b899f588 lavfi/gradfun: remove nv21/nv12 as they are not supported 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:07:12 +00:00
Hendrik Leppkes
af2a196e66 lavfi: add attribute_align_arg to all public entry points 
Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 13:59:30 +02:00
Paul B Mahol
2a1a599bcb lavfi/buffersrc: remove unused item from BufferSourceContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 11:43:43 +00:00
Michael Niedermayer
de0a1f63df avfilter/can_merge_formats: fix memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 16:54:04 +02:00
Michael Niedermayer
6bde1e9d14 avfilter/avfiltergraph: fix check using the wrong variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 16:53:39 +02:00
Michael Niedermayer
5156d482cd avfilter/vf_scale: use the inputs color range when its set and its not overridden 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 02:50:46 +02:00
Michael Niedermayer
24a4367ae9 vf_scale: add input h/v_chr_pos parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 18:33:58 +02:00
Michael Niedermayer
e31d20255d vf_scale: add output h/v_chr_pos parameterss 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 18:27:10 +02:00
Michael Niedermayer
6a0b72f94f avfilter/avfiltergraph: minor cosmetic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 20:58:21 +02:00
Michael Niedermayer
fe328f0807 avfilter: Dont partially merge lists 
This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 19:14:04 +02:00
Michael Niedermayer
5169111145 avfilter/REDUCE_FORMATS: fix bug that ended reducing too early 
Prior to this it was possible that format reduction was ended
before it fully propagated leading to failure later in picking
formats.
No testcase with unmodified source exists, the case was reproduced
with less aggressive list merging though.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 02:48:13 +02:00
Michael Niedermayer
1f7acf3cff vfilter/vf_scale: avoid using "{}" 
Should fix compile issues with MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 04:47:09 +02:00
Michael Niedermayer
3242747df3 avfilter/vf_scale; fix indent 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-20 22:20:25 +02:00
Michael Niedermayer
835eee88ec avfilter/vf_scale: add in/out color range option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-20 22:13:23 +02:00
Michael Niedermayer
bbf6cb754c avfilter/vf_scale: Add in/out yuv color matrix option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-20 22:11:50 +02:00
Michael Niedermayer
b67401797e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: filtfmts: use newer avfilter APIs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-20 10:50:51 +02:00
Michael Niedermayer
74561680cd avfilter/vf_separatefields: fix ;; 
Found-by: llogan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-20 00:44:09 +02:00
wm4
122536e01a avfilter: fix preprocessor condition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 22:10:16 +02:00
Michael Niedermayer
8589d7a61c avfilter/vf_yadif:remove unneeded include assert.h 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 18:53:57 +02:00
Vittorio Giovara
6756d98cec lavfi: filtfmts: use newer avfilter APIs 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-19 12:22:30 +03:00
Carl Eugen Hoyos
36b21e17a2 lavf/concat: Never fail for sample aspect ratio 0:1. 
Fixes ticket #2456.

Reviewed-by: Nicolas George
 2013-07-18 13:51:23 +02:00
Carl Eugen Hoyos
42272e86fe lut3d: Fix reading 3dl files with leading comments. 
Fixes ticket #2787.
 2013-07-18 13:51:23 +02:00
Nicolas George
ebaf20e94b lavfi/scale: allocate interlaced scalers only if needed. 
Fix "Value 0.000000 for parameter 'srch' out of range"
error message when source or destination height is 1.

Note: since the av_opt_set_int() calls are not checked for
failure and the interlaced scalers are not actually used,
this error has no consequence apart from a frightening message
in the log.
 2013-07-18 12:08:25 +02:00
Michael Niedermayer
9d01bf7d66 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Consistently use "cpu_flags" as variable/parameter name for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideo.c
	libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-18 09:53:47 +02:00
Michael Niedermayer
37ded53037 vf_scale: use sws_init_context() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-18 01:21:27 +02:00
Diego Biurrun
3ac7fa81b2 Consistently use "cpu_flags" as variable/parameter name for CPU flags 2013-07-18 00:31:35 +02:00
Michael Niedermayer
10336ca640 Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12' 
* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
  pthread: Rename thread_init to avoid symbol collision

Conflicts:
	libavcodec/pthread.c
	libavfilter/pthread.c

See: 674d8a9629
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-17 10:40:15 +02:00
Sean McGovern
50612484e0 pthread: Rename thread_init to avoid symbol collision 
The AIX threads library exposes a function with the same name.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-17 00:13:31 +03:00
Paul B Mahol
5999db97cf lavfi/scale: remove av_opt_free() 
Generic code calls it already.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-15 15:27:19 +00:00
Michael Niedermayer
3ea765b033 avfilter/avf_concat: fix AVOption flags typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-15 14:15:15 +02: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
d5598c0963 lavfi/drawutils: set subsampling for rgb too 
Otherwise it is incorrectly set to 1.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-14 17:59:25 +00:00
Paul B Mahol
ed448efe61 lavfi/mp: remove mp=perspective 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-14 16:27:18 +00:00
Paul B Mahol
80c6445932 lavfi: port perspective filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-14 16:27:17 +00:00
Paul B Mahol
fc6ca37316 lavfi/aecho: fix invalid free 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-13 23:45:05 +00:00
Paul B Mahol
f486d7e924 lavfi/silencedetect: unbreak for unknown channel layouts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-13 22:23:09 +00:00
Paul B Mahol
099dfcaa0e lavfi/ashowinfo: unbreak for >8 channels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-13 22:04:14 +00:00
Paul B Mahol
729709b890 lavfi/asetnsamples: unbreak for >8 channels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-13 21:59:13 +00:00
Paul B Mahol
e9678631f1 lavfi/trim: fix sample copy for >8 channels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-13 21:54:02 +00:00
Paul B Mahol
6347824d53 lavfi/showwaves: fix floating exception with >8 channels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-13 21:46:27 +00:00
Michael Niedermayer
aac57c765f avfilter/asrc_aevalsrc: fix cases of unknown channel layout 
Fixes >8 channels

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-13 23:10:15 +02:00
Jean Delvare
b6d0bb6086 lavfi/delogo: Fix sign extension issue 
Coverity complains about a possible sign extension issue in
apply_delogo(). While it is extremely unlikely to happen, it is easy
to fix so let's just do that. Using unsigned variables even makes the
binary code smaller.

Fixes Coverity CID 1046439.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-13 17:05:03 +02:00
Michael Niedermayer
9219ec93b1 avfilter/trim: add compatibility layer to not break ABI used by ffmpeg 
This is a hotfix to fix -t / -ss
a different solution might be choosen later, i just dont want to leave
this broken

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 21:27:26 +02:00
Paul B Mahol
b3405b1bda lavfi/trim: use AV_OPT_TYPE_DURATION 
Workarounds for rounding differences between platforms should not be
needed any more.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-12 15:58:22 +00:00
Paul B Mahol
937cfebd72 lavfi/aevalsrc: remove hard limit on number of channels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-12 15:51:47 +00:00
Michael Niedermayer
86d1a5d80f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_interlace: better handling of odd video size

Conflicts:
	libavfilter/vf_interlace.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 14:58:41 +02:00
Michael Niedermayer
bec509db43 vf_interlace: better handling of odd video size 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-12 11:40:56 +03:00
Paul B Mahol
db4e191d88 lavfi/aevalsrc: do not free AVOption variables in uninit() 
The generic code frees them already.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:22:07 +00:00
Paul B Mahol
badbd2414d lavfi/aevalsrc: use AV_OPT_TYPE_DURATION 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:16:00 +00:00
Paul B Mahol
1e89f74902 lavfi/afade: use av_rescale() 
Should not make a difference, but its good idea.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:13:28 +00:00
Michael Niedermayer
0a3a0edd52 avfilter/af_earwax: Fix out of array accesses on odd packets 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:46:13 +02:00
Paul B Mahol
bc95b94289 lavfi/aconvert: unbreak 
Even if its deprecated, it should still work correctly.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 13:16:24 +00:00
Paul B Mahol
884c890535 lavfi: add aecho filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 12:10:58 +00:00
Michael Niedermayer
d5de123195 avfilter/graphparse: Fix build with --enable-incompatible-fork-abi 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 19:06:32 +02:00
Paul B Mahol
c5a1b18f18 lavfi/drawtext: add support for printing frame metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-09 15:21:01 +00:00
Paul B Mahol
3c5071db88 lavfi/psnr: rename 's' parameter to match documentation 
Also removes some irrelevant lines in documentation.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-09 09:40:53 +00:00
Paul B Mahol
a03e79ed5a lavfi: fix broken logic in metadata handling 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 20:13:56 +00:00
Paul B Mahol
19c8f22714 lavfi/rotate: switch to new drawutils 
Get rid of ugly hacks, also add support for more pixel formats.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:49 +00:00
Paul B Mahol
55c94f48ce lavfi/drawutils: fix planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:49 +00:00
Paul B Mahol
d2dd1e075c lavfi/pad: use FFSIGN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:48 +00:00
Paul B Mahol
6150bec3f8 lavfi: add psnr filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 14:58:04 +00:00
Paul B Mahol
d64f3b72e0 replace some deprecated defines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-06 05:43:24 +00:00
Paul B Mahol
9635806265 lavfi/blend: use dual input helpers 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-06 04:58:34 +00:00
Jean Delvare
4e10d87f38 lavfi/delogo: band width must be at least 1 
We need at least one pixel around the logo to use as known points to
interpolate from. So properly declare the band/t attribute has having
a minimum value of 1.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 18:02:11 +02:00
Jean Delvare
72abce3c46 lavfi/delogo: option show shouldn't affect band 
Options "show" and "band" are unrelated and should thus be
independent. However, setting "show" to 1 currently resets "band" to
its default value of 4. While this is documented, this still
surprising and confusing IMHO.

Change this behavior and make "show" and "band" independent from each
other. Update the documentation accordingly.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 18:02:11 +02:00
Paul B Mahol
413f865a9a lavfi/blackdetect: support 2 more pixels formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-05 15:30:37 +00:00
Paul B Mahol
9dd1447788 lavfi/cropdetect: export cropdetect info to frame metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-05 15:07:33 +00:00
Jean Delvare
4e8d6b315c lavfi/delogo: remember left and right samples when interpolating 
The left and right samples are the same for the whole line, so store
their values and don't recompute them for every iteration of "y".

This simple optimization results in a speed improvement between 15%
and 20% in my tests (depending on the logo geometry.)

Result is obviously the same.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 13:53:37 +02:00
Jean Delvare
6fc8c4cc0e lavfi/delogo: don't recompute the same difference again and again 
The top left hand corner pixel coordinates are already stored in
logo_x1 and logo_y1 so don't recompute each of them 6 times for every
iteration.

This is a simple code optimization, result is obviously the same. The
performance gain is small (about 2% in my tests) but still good to
have, and the new code is clearer.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by; Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 13:52:59 +02:00
Paul B Mahol
253e155251 lavfi/crop: support more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-04 11:46:06 +00:00