Michael Niedermayer
e41d3aba01
Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'
...
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
graphparser: only print filter arguments if they are non-NULL
af_channelmap: ensure the output channel layout is valid.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:16:31 +02:00
Michael Niedermayer
a1b8879714
Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'
...
* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
af_channelmap: remove now unnecessary goto
vf_split: fix description
Conflicts:
libavfilter/split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:11:01 +02:00
Michael Niedermayer
52fa2945b5
Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633'
...
* commit 'e036bb7899d0faca9159206be9bf5552e76e7633':
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
FATE: add an additional indeo3 test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:00:08 +02:00
Michael Niedermayer
d8b6557c86
Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'
...
* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61':
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 09:51:37 +02:00
Michael Niedermayer
71091698a2
Merge commit '95220be1faac628d849a004644c0d102df0aa98b'
...
* commit '95220be1faac628d849a004644c0d102df0aa98b':
indeo3: fix off by one in MV validity check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 09:45:09 +02:00
Clément Bœsch
14f45bcbe7
doc/filters: fix scale example equivalence.
...
scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...
2013-05-01 04:46:14 +02:00
Clément Bœsch
e3e66568cc
doc/filters: replace hqdn3d with smartblur in timeline section.
...
hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).
2013-05-01 04:44:27 +02:00
Michael Niedermayer
fbaf75b166
h264: Use the correct croping values.
...
This fixes returning pictures with corrupted data pointers.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 00:06:26 +02:00
Michael Niedermayer
5299ee54a7
h264: assert that croping values at slice level are consistent
...
These values where checked before already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 23:49:56 +02:00
Michael Niedermayer
c3bd306e78
h264_ps: check croping values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 23:48:53 +02:00
Michael Niedermayer
7edb984dd0
avutil/log: Fix context pointer used for get_category()
...
Fixes calling a random pointer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 20:06:24 +02:00
Michael Niedermayer
53efb2fa09
gif: Fix little endian specific code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 13:35:14 +02:00
Michael Niedermayer
147a45fca4
framecrcenc: workaround design flaw in sidedata palette
...
This should be reverted once palettes are dealt with in a endian independant way
in packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 13:35:14 +02:00
Paul B Mahol
a0adeb1f9f
fate: add test for separatefields filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 10:22:16 +00:00
Paul B Mahol
468ec1714c
fate: add test for swapuv filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 10:18:45 +00:00
Paul B Mahol
e85f02e3f5
fate: add test for telecine filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 10:10:23 +00:00
Anton Khirnov
c22263d3e8
graphparser: only print filter arguments if they are non-NULL
2013-04-30 11:16:57 +02:00
Anton Khirnov
8aaab1113c
af_channelmap: ensure the output channel layout is valid.
2013-04-30 11:16:37 +02:00
Anton Khirnov
949c603ed9
af_channelmap: remove now unnecessary goto
...
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
2013-04-30 11:16:22 +02:00
Anton Khirnov
1012155722
vf_split: fix description
...
It now allows an arbitrary number of inputs, not just two.
2013-04-30 11:16:16 +02:00
Anton Khirnov
e036bb7899
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
...
Otherwise some code might mistakenly think it is allowed to unref those
buffers, which would lead to double unref.
2013-04-30 11:15:32 +02:00
Paul B Mahol
2bdd434931
lavfi/stereo3d: add support for alternating frames input & output format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 09:13:36 +00:00
Anton Khirnov
bda9e6d923
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
...
They are the same in this case, except put_pixels also has blocksizes
smaller than 8.
2013-04-30 11:06:03 +02:00
Anton Khirnov
95220be1fa
indeo3: fix off by one in MV validity check
...
CC:libav-stable@libav.org
2013-04-30 11:06:03 +02:00
Anton Khirnov
3d10614529
FATE: add an additional indeo3 test
...
It is a part of the sample that got broken by recent indeo3 changes.
2013-04-30 11:06:03 +02:00
Michael Niedermayer
01a5a3a2e8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Remove a set of pointless #ifs around function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 08:42:10 +02:00
Michael Niedermayer
a3030d47e7
Merge commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295'
...
* commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295':
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 08:25:24 +02:00
Clément Bœsch
2609434b45
fate: remove forgotten transpose filter results from old system.
2013-04-30 02:12:47 +02:00
Clément Bœsch
45734dea9e
fate: port remaining filters to new system.
...
Merge of b963f021b6
is now complete.
2013-04-30 02:12:45 +02:00
Clément Bœsch
93aede41ce
fate: move kerndeint test to the new system.
2013-04-30 01:47:53 +02:00
Clément Bœsch
1e0a0aafba
fate: port our pixfmts change to fate-run.sh.
...
This patch is the same as 52b23cbf1c
.
2013-04-30 01:47:53 +02:00
Clément Bœsch
e881057c98
fate: add a rule for pixfmts tests.
2013-04-30 01:47:53 +02:00
Diego Biurrun
97c56ad796
x86: dsputil: Remove a set of pointless #ifs around function declarations
2013-04-30 01:42:32 +02:00
Diego Biurrun
85f2f82af6
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
2013-04-30 01:41:05 +02:00
Clément Bœsch
a466c2c470
fate: fix filtfmts-test dependency after 9a5924f
.
2013-04-30 01:19:24 +02:00
Clément Bœsch
d558e46469
lavfi: add two opencl headers to SKIPHEADERS.
...
Fix make checkheaders.
2013-04-30 00:34:58 +02:00
Clément Bœsch
6b222ea963
fate: add bitexact flags to alphaextract/alphamerge tests.
...
Should fix a FATE failure.
2013-04-29 22:28:37 +02:00
Clément Bœsch
9a5924f862
fate: add filters dependencies to pixfmts tests.
2013-04-29 22:25:04 +02:00
Clément Bœsch
15d6436a2a
fate: move a few simple pixfmts tests to the new system.
2013-04-29 22:25:04 +02:00
Michael Niedermayer
16b2472d20
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: hpeldsp: Remove unused macro definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 22:01:53 +02:00
Clément Bœsch
3ae44df18f
fate: move lavd filters tests to the new system.
...
Also make life test a bit more useful.
2013-04-29 21:48:49 +02:00
Clément Bœsch
6ea013fb62
fate: remove '#' in filter parameters.
...
It was considered a comment.
2013-04-29 21:48:48 +02:00
Paul B Mahol
c645659988
lavfi/showwaves: fix crash in case of negative linesize
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-29 19:28:12 +00:00
Paul B Mahol
32d4641219
lavfi/showspectrum: fix crash in case of negative linesize
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-29 19:27:15 +00:00
Clément Bœsch
22a86492ec
fate: move alphaextract and alphamerge tests to the new system.
...
The standalone alphaextract tests are removed since already the filters
are already tested by the alphamerge tests.
2013-04-29 21:10:13 +02:00
Michael Niedermayer
affd5018ac
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Recognize j2k as file suffix for the image2 muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 20:25:23 +02:00
Clément Bœsch
9a0e40ec8c
fate: move colormatrix tests to the new system.
2013-04-29 20:20:13 +02:00
Clément Bœsch
80bcbed157
fate: restore our settings for drawtext/fade/unsharp.
2013-04-29 20:00:49 +02:00
Clément Bœsch
c703f7bdbd
fate: move more tests from lavfi-regression.sh to filter-video.mak.
2013-04-29 20:00:49 +02:00
Diego Biurrun
20784aa678
x86: hpeldsp: Remove unused macro definitions
2013-04-29 15:57:00 +02:00