Anton Khirnov
b318106fae
FATE: add a test for the lavr mixing case fixed in fc6a3ef40d
2014-01-03 16:44:03 +01:00
James Almer
8feaa83d47
fate: Add OggVP8 demux test
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-02 02:31:24 +01:00
Michael Niedermayer
d2d794f3aa
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: Explicitly specify the pixel format for the pngparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-19 03:18:07 +01:00
Martin Storsjö
e121a725c3
fate: Explicitly specify the pixel format for the pngparser test
...
The RGB32 pixel format is RGBA/BGRA depending on target
endianness - make sure to convert it to one specific format for
the framecrc tests.
This fixes the pngparser fate test on big endian.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-18 21:21:41 +02:00
Michael Niedermayer
682b28b410
Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
...
* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
fate: add a pngparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-17 18:55:15 +01:00
Vittorio Giovara
cfb4ee3097
fate: add a pngparser test
2013-12-17 09:34:08 +01:00
Michael Niedermayer
28eacd1351
Merge commit '58a868968df445068a143f327ced03b6a02baf0d'
...
* commit '58a868968df445068a143f327ced03b6a02baf0d':
FATE: drop the last partial frame in the wmv8-drm test
Conflicts:
tests/ref/fate/wmv8-drm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 04:03:05 +01:00
Anton Khirnov
58a868968d
FATE: drop the last partial frame in the wmv8-drm test
...
This has already been done in eb066a4ce9
,
but the number of frames produced from that file changed due to
timestamps changes since then.
2013-12-05 13:27:52 +01:00
Michael Niedermayer
04e06cdf7d
avcodec: split mp2 encoder into float and fixed
...
This makes the USE_FLOATS == 0 available to the end user
More float optimizations can easily be added as well now
common code should be factored out into a common file once all
fixed point & floating point optimizations are done, this is to
avoid having to move code back and forth between files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-03 21:12:00 +01:00
Ronald S. Bultje
65f41b5c5c
vp9: add a new segmentation sample.
...
The old one didn't use segmentation. One uses segmentation in all frame
types (--aq-mode=1), and the other uses all segmentation features, but
only in inter frames (mbgraph).
2013-11-30 16:26:14 -05:00
Ronald S. Bultje
1d6bb21348
vp9: add fate sample for parallelmode.
...
This disables backward probability updates, which makes the codec more
friendly for frame-level multi-threading.
2013-11-30 16:26:14 -05:00
Michael Niedermayer
a486dec4fd
Merge commit '874838dc6589d978611c89a40694a5074f892a76'
...
* commit '874838dc6589d978611c89a40694a5074f892a76':
fate: add one select filter test
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21 18:49:41 +01:00
Vittorio Giovara
874838dc65
fate: add one select filter test
...
This test selects alternate frames from input.
2013-11-21 13:01:00 +01:00
Michael Niedermayer
ec312c1fd0
fate: test -mbd rd for h261
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 15:38:56 +01:00
Michael Niedermayer
459c7cb256
fate: add h261 trellis quantization test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 15:08:56 +01:00
Michael Niedermayer
10ac6f3ce9
Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
...
* commit '952f943d40e9dbcd68bc851460cc99268091a294':
FATE: add a jv test
Conflicts:
tests/fate/video.mak
tests/ref/fate/jv
See: 7c52070131
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 01:22:35 +01:00
Anton Khirnov
952f943d40
FATE: add a jv test
2013-11-16 13:20:06 +01:00
Michael Niedermayer
97962b278a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: VP9 decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
libavcodec/vp9.c
libavcodec/vp9.h
libavcodec/vp9data.h
libavcodec/vp9dsp.c
libavcodec/x86/Makefile
libavcodec/x86/vp9dsp.asm
libavcodec/x86/vp9dsp_init.c
tests/fate/vpx.mak
tests/ref/fate/vp9-00-quantizer-00
tests/ref/fate/vp9-00-quantizer-01
tests/ref/fate/vp9-00-quantizer-02
tests/ref/fate/vp9-00-quantizer-03
tests/ref/fate/vp9-00-quantizer-04
tests/ref/fate/vp9-00-quantizer-05
tests/ref/fate/vp9-00-quantizer-06
tests/ref/fate/vp9-00-quantizer-07
tests/ref/fate/vp9-00-quantizer-08
tests/ref/fate/vp9-00-quantizer-09
tests/ref/fate/vp9-00-quantizer-10
tests/ref/fate/vp9-00-quantizer-11
tests/ref/fate/vp9-00-quantizer-12
tests/ref/fate/vp9-00-quantizer-13
tests/ref/fate/vp9-00-quantizer-14
tests/ref/fate/vp9-00-quantizer-15
tests/ref/fate/vp9-00-quantizer-16
tests/ref/fate/vp9-00-quantizer-17
tests/ref/fate/vp9-00-quantizer-18
tests/ref/fate/vp9-00-quantizer-19
tests/ref/fate/vp9-00-quantizer-20
tests/ref/fate/vp9-00-quantizer-21
tests/ref/fate/vp9-00-quantizer-22
tests/ref/fate/vp9-00-quantizer-23
tests/ref/fate/vp9-00-quantizer-24
tests/ref/fate/vp9-00-quantizer-25
tests/ref/fate/vp9-00-quantizer-26
tests/ref/fate/vp9-00-quantizer-27
tests/ref/fate/vp9-00-quantizer-28
tests/ref/fate/vp9-00-quantizer-29
tests/ref/fate/vp9-00-quantizer-30
tests/ref/fate/vp9-00-quantizer-31
tests/ref/fate/vp9-00-quantizer-32
tests/ref/fate/vp9-00-quantizer-33
tests/ref/fate/vp9-00-quantizer-34
tests/ref/fate/vp9-00-quantizer-35
tests/ref/fate/vp9-00-quantizer-36
tests/ref/fate/vp9-00-quantizer-37
tests/ref/fate/vp9-00-quantizer-38
tests/ref/fate/vp9-00-quantizer-39
tests/ref/fate/vp9-00-quantizer-40
tests/ref/fate/vp9-00-quantizer-41
tests/ref/fate/vp9-00-quantizer-42
tests/ref/fate/vp9-00-quantizer-43
tests/ref/fate/vp9-00-quantizer-44
tests/ref/fate/vp9-00-quantizer-45
tests/ref/fate/vp9-00-quantizer-46
tests/ref/fate/vp9-00-quantizer-47
tests/ref/fate/vp9-00-quantizer-48
tests/ref/fate/vp9-00-quantizer-49
tests/ref/fate/vp9-00-quantizer-50
tests/ref/fate/vp9-00-quantizer-51
tests/ref/fate/vp9-00-quantizer-52
tests/ref/fate/vp9-00-quantizer-53
tests/ref/fate/vp9-00-quantizer-54
tests/ref/fate/vp9-00-quantizer-55
tests/ref/fate/vp9-00-quantizer-56
tests/ref/fate/vp9-00-quantizer-57
tests/ref/fate/vp9-00-quantizer-58
tests/ref/fate/vp9-00-quantizer-59
tests/ref/fate/vp9-00-quantizer-60
tests/ref/fate/vp9-00-quantizer-61
tests/ref/fate/vp9-00-quantizer-62
tests/ref/fate/vp9-00-quantizer-63
tests/ref/fate/vp9-01-sharpness-1
tests/ref/fate/vp9-01-sharpness-2
tests/ref/fate/vp9-01-sharpness-3
tests/ref/fate/vp9-01-sharpness-4
tests/ref/fate/vp9-01-sharpness-5
tests/ref/fate/vp9-01-sharpness-6
tests/ref/fate/vp9-01-sharpness-7
tests/ref/fate/vp9-02-size-08x08
tests/ref/fate/vp9-02-size-08x10
tests/ref/fate/vp9-02-size-08x16
tests/ref/fate/vp9-02-size-08x18
tests/ref/fate/vp9-02-size-08x32
tests/ref/fate/vp9-02-size-08x34
tests/ref/fate/vp9-02-size-08x64
tests/ref/fate/vp9-02-size-08x66
tests/ref/fate/vp9-02-size-10x08
tests/ref/fate/vp9-02-size-10x10
tests/ref/fate/vp9-02-size-10x16
tests/ref/fate/vp9-02-size-10x18
tests/ref/fate/vp9-02-size-10x32
tests/ref/fate/vp9-02-size-10x34
tests/ref/fate/vp9-02-size-10x64
tests/ref/fate/vp9-02-size-10x66
tests/ref/fate/vp9-02-size-16x08
tests/ref/fate/vp9-02-size-16x10
tests/ref/fate/vp9-02-size-16x16
tests/ref/fate/vp9-02-size-16x18
tests/ref/fate/vp9-02-size-16x32
tests/ref/fate/vp9-02-size-16x34
tests/ref/fate/vp9-02-size-16x64
tests/ref/fate/vp9-02-size-16x66
tests/ref/fate/vp9-02-size-18x08
tests/ref/fate/vp9-02-size-18x10
tests/ref/fate/vp9-02-size-18x16
tests/ref/fate/vp9-02-size-18x18
tests/ref/fate/vp9-02-size-18x32
tests/ref/fate/vp9-02-size-18x34
tests/ref/fate/vp9-02-size-18x64
tests/ref/fate/vp9-02-size-18x66
tests/ref/fate/vp9-02-size-32x08
tests/ref/fate/vp9-02-size-32x10
tests/ref/fate/vp9-02-size-32x16
tests/ref/fate/vp9-02-size-32x18
tests/ref/fate/vp9-02-size-32x32
tests/ref/fate/vp9-02-size-32x34
tests/ref/fate/vp9-02-size-32x64
tests/ref/fate/vp9-02-size-32x66
tests/ref/fate/vp9-02-size-34x08
tests/ref/fate/vp9-02-size-34x10
tests/ref/fate/vp9-02-size-34x16
tests/ref/fate/vp9-02-size-34x18
tests/ref/fate/vp9-02-size-34x32
tests/ref/fate/vp9-02-size-34x34
tests/ref/fate/vp9-02-size-34x64
tests/ref/fate/vp9-02-size-34x66
tests/ref/fate/vp9-02-size-64x08
tests/ref/fate/vp9-02-size-64x10
tests/ref/fate/vp9-02-size-64x16
tests/ref/fate/vp9-02-size-64x18
tests/ref/fate/vp9-02-size-64x32
tests/ref/fate/vp9-02-size-64x34
tests/ref/fate/vp9-02-size-64x64
tests/ref/fate/vp9-02-size-64x66
tests/ref/fate/vp9-02-size-66x08
tests/ref/fate/vp9-02-size-66x10
tests/ref/fate/vp9-02-size-66x16
tests/ref/fate/vp9-02-size-66x18
tests/ref/fate/vp9-02-size-66x32
tests/ref/fate/vp9-02-size-66x34
tests/ref/fate/vp9-02-size-66x64
tests/ref/fate/vp9-02-size-66x66
tests/ref/fate/vp9-03-deltaq
tests/ref/fate/vp9-03-size-196x196
tests/ref/fate/vp9-03-size-196x198
tests/ref/fate/vp9-03-size-196x200
tests/ref/fate/vp9-03-size-196x202
tests/ref/fate/vp9-03-size-196x208
tests/ref/fate/vp9-03-size-196x210
tests/ref/fate/vp9-03-size-196x224
tests/ref/fate/vp9-03-size-196x226
tests/ref/fate/vp9-03-size-198x196
tests/ref/fate/vp9-03-size-198x198
tests/ref/fate/vp9-03-size-198x200
tests/ref/fate/vp9-03-size-198x202
tests/ref/fate/vp9-03-size-198x208
tests/ref/fate/vp9-03-size-198x210
tests/ref/fate/vp9-03-size-198x224
tests/ref/fate/vp9-03-size-198x226
tests/ref/fate/vp9-03-size-200x196
tests/ref/fate/vp9-03-size-200x198
tests/ref/fate/vp9-03-size-200x200
tests/ref/fate/vp9-03-size-200x202
tests/ref/fate/vp9-03-size-200x208
tests/ref/fate/vp9-03-size-200x210
tests/ref/fate/vp9-03-size-200x224
tests/ref/fate/vp9-03-size-200x226
tests/ref/fate/vp9-03-size-202x196
tests/ref/fate/vp9-03-size-202x198
tests/ref/fate/vp9-03-size-202x200
tests/ref/fate/vp9-03-size-202x202
tests/ref/fate/vp9-03-size-202x208
tests/ref/fate/vp9-03-size-202x210
tests/ref/fate/vp9-03-size-202x224
tests/ref/fate/vp9-03-size-202x226
tests/ref/fate/vp9-03-size-208x196
tests/ref/fate/vp9-03-size-208x198
tests/ref/fate/vp9-03-size-208x200
tests/ref/fate/vp9-03-size-208x202
tests/ref/fate/vp9-03-size-208x208
tests/ref/fate/vp9-03-size-208x210
tests/ref/fate/vp9-03-size-208x224
tests/ref/fate/vp9-03-size-208x226
tests/ref/fate/vp9-03-size-210x196
tests/ref/fate/vp9-03-size-210x198
tests/ref/fate/vp9-03-size-210x200
tests/ref/fate/vp9-03-size-210x202
tests/ref/fate/vp9-03-size-210x208
tests/ref/fate/vp9-03-size-210x210
tests/ref/fate/vp9-03-size-210x224
tests/ref/fate/vp9-03-size-210x226
tests/ref/fate/vp9-03-size-224x196
tests/ref/fate/vp9-03-size-224x198
tests/ref/fate/vp9-03-size-224x200
tests/ref/fate/vp9-03-size-224x202
tests/ref/fate/vp9-03-size-224x208
tests/ref/fate/vp9-03-size-224x210
tests/ref/fate/vp9-03-size-224x224
tests/ref/fate/vp9-03-size-224x226
tests/ref/fate/vp9-03-size-226x196
tests/ref/fate/vp9-03-size-226x198
tests/ref/fate/vp9-03-size-226x200
tests/ref/fate/vp9-03-size-226x202
tests/ref/fate/vp9-03-size-226x208
tests/ref/fate/vp9-03-size-226x210
tests/ref/fate/vp9-03-size-226x224
tests/ref/fate/vp9-03-size-226x226
tests/ref/fate/vp9-2pass-akiyo
tests/ref/fate/vp9-segmentation-akiyo
tests/ref/fate/vp9-tiling-pedestrian
Not merged at the request of the authors and maintainers
"<ubitux> we have a lot of fixes they don't have, as well as optim actually"
See: 848826f527
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15 15:24:36 +01:00
Ronald S. Bultje
72ca830f51
lavc: VP9 decoder
...
Originally written by Ronald S. Bultje <rsbultje@gmail.com> and
Clément Bœsch <u@pkh.me>
Further contributions by:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö <martin@martin.st>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-15 10:16:28 +01:00
Diego Biurrun
33311af75d
fate: Add VCR2 test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14 08:49:31 +01:00
Guillaume Martres
e1c058dba9
FATE: Add HEVC tests
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31 20:20:16 +01:00
Paul B Mahol
79ef4b19bf
FATE: add bitexact sws flags to the fieldorder test
...
swscale is called for the 420 to 422 conversion
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-27 21:34:28 +01:00
Guillaume Martres
7b0f61a936
FATE: update HEVC tests
...
This changes the tests that used the internal hevc checksum to use framecrc
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:
tests/fate/hevc.mak
tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
tests/ref/fate/hevc-conformance-POC_A_Bossen_3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 10:15:56 +01:00
Michael Niedermayer
7e19c549ba
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: aac: Add test for AAC-ELD
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 02:58:08 +02:00
Alex Converse
4e326ec769
fate: aac: Add test for AAC-ELD
2013-10-25 19:41:23 +00:00
Michael Niedermayer
92f649b411
avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL
...
Approved-by: mraulet
Approved-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 20:00:11 +02:00
Paul B Mahol
3a75c4e93b
fate: fix fieldorder test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-23 17:35:37 +00:00
Michael Niedermayer
3ce7c62e1b
avformat/framehash: add software version to framecrc/md5
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 16:32:32 +02:00
Michael Niedermayer
519395e4dd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add fieldorder filter test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:43:32 +02:00
Vittorio Giovara
157dc0b489
fate: add fieldorder filter test
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-22 10:59:03 +02:00
Michael Niedermayer
80b8f78048
fate: enable hevc tests
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 14:22:41 +02:00
Michael Niedermayer
712eff4978
fate: add synthetic swresample resampling tests
...
this is based on libavresample.mak
These tests do not depend on external samples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 00:12:06 +02:00
Diego Biurrun
23e6d3d4e2
fate: vpx: Remove one redundant $(eval) invocation
2013-10-19 15:09:29 +02:00
Michael Niedermayer
57c018d542
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: Increase the tolerance in the lavr tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17 20:15:22 +02:00
Michael Niedermayer
123c6ca809
Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'
...
* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
fate: aac: Add test for AAC-LD
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17 19:51:12 +02:00
Martin Storsjö
a27f1116cd
fate: Increase the tolerance in the lavr tests
...
A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently
still fail a few tests with a maxdiff of 6.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-17 19:09:50 +03:00
Diego Biurrun
f52fd3f3b2
fate: aac: Add test for AAC-LD
2013-10-17 12:36:35 +02:00
Michael Niedermayer
83bfcc3ce2
Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'
...
* commit '6b081eff4dfc3c899960f69f30cb567266b7dca3':
fate: add vorbiscomment cover art test
Conflicts:
tests/fate/cover-art.mak
See: 1ca3902726
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 12:23:34 +02:00
Michael Niedermayer
8778c49ace
Merge commit '68edd5be0980941924ae633d98589d56a8091bbd'
...
* commit '68edd5be0980941924ae633d98589d56a8091bbd':
FATE: use proper comparison mode in the lavr tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 12:12:21 +02:00
Michael Niedermayer
48e1114abf
fate: fix DBLK_A_MAIN10_VIXS_2 on big endian
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 01:26:50 +02:00
Guillaume Martres
fb3cea4be3
FATE: add HEVC tests
...
The tests are disabled as 2 do not pass yet
(fate-hevc-conformance-PPS_A_qualcomm_7 and fate-hevc-conformance-RAP_A_docomo_4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 01:25:58 +02:00
James Almer
6b081eff4d
fate: add vorbiscomment cover art test
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-15 19:48:27 +02:00
Anton Khirnov
68edd5be09
FATE: use proper comparison mode in the lavr tests
2013-10-15 19:11:49 +02:00
Paul B Mahol
ccfb550b2c
fate: add pxr24 exr test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-15 12:41:23 +00:00
Michael Niedermayer
b35ef855a4
Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'
...
* commit '364af376f343d4706c4cdb7ab9fe0863994e6c01':
FATE: add lavr resampling tests
The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 08:01:56 +02:00
Michael Niedermayer
de80cebdd7
Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'
...
* commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1':
FATE: add lavr mixing tests
The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 07:32:11 +02:00
Anton Khirnov
364af376f3
FATE: add lavr resampling tests
2013-10-12 15:07:46 +02:00
Anton Khirnov
9ab5f7107d
FATE: add lavr mixing tests
2013-10-12 15:07:26 +02:00
Michael Niedermayer
4c292d5c34
Merge remote-tracking branch 'rbultje/master'
...
* rbultje/master:
Full-pixel MC functions.
VP9 MC (ssse3) optimizations.
Native VP9 decoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 13:56:52 +02:00
Ronald S. Bultje
848826f527
Native VP9 decoder.
...
Authors: Ronald S. Bultje <rsbultje gmail com>,
Clement Boesch <u pkh me>
2013-10-02 21:03:11 -04:00
Marton Balint
cac9af68a4
avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-01 21:04:31 +00:00
Paul B Mahol
fc0d8cf185
fate: add fieldorder test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-30 16:02:42 +00:00
Paul B Mahol
c2d1943029
fate: add phase test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-27 18:57:55 +00:00
Michael Niedermayer
fbf861cb84
tests/fate/prores: fix skip alpha tests on big endian
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 20:57:34 +02:00
Reimar Döffinger
547c2f002a
Make decoding alpha optional for some codecs.
...
For codecs where decoding of a whole plane can simply
be skipped, we should offer applications to not decode
alpha for better performance (ca. 30% less CPU usage
and 40% reduced memory bandwidth).
It also means applications do not need to implement support
(even if it is rather simple) for YUVA formats in order to be
able to play these files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-22 16:20:54 +02:00
Paul B Mahol
f35b2fa8c9
fate: add adelay test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-21 03:37:09 +00:00
James Almer
ea70e2f2d7
matroskaenc: Write muxingapp and writingapp elements when using bitexact flag
...
Files won't validate with mkvalidtor if these two elements are missing.
Use a const "Lavf" string that wont change with library version bumps.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18 23:06:59 +02:00
James Almer
93439e8b6f
fate: Fix exif tests ffprobe dependency
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18 22:59:40 +02:00
James Almer
d59213b5d3
matroskaenc: Bump DocTypeVersion to 4
...
The muxer has been creating files with v4 elements for some time now,
and especially now that we can mux non-experimental Opus files, reporting
the DocTypeVersion as 2 is not correct.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15 02:08:15 +02:00
John Stebbins
f812eeda17
matroskaenc: Fix writing TRACKDEFAULTFLAG
...
The element was only being written when the value == 1. But the default
value of this element is 1, so this has no useful effect. This element
needs to be written when the value == 0.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-27 14:00:31 +02:00
Michael Niedermayer
ffdbec6fc9
tests/fate/libavcodec: fate-idct8x8 needs dct
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 20:37:31 +02:00
Michael Niedermayer
0617efa7f7
tests/fate/fft: add mdct dependency as mdct is used too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 20:36:35 +02:00
Michael Niedermayer
e29c29e10a
tests/fate/cover-art: add file protocol & rawvideo muxer dependency
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 20:35:57 +02:00
Michael Niedermayer
abe76b851c
ffv1enc: Make ffv1.3 non experimental
...
The fate tests change as they used 1.2 previously
The increased size is due to:
32bit CRCs per slice by default (can be disabled),
it adds slice headers to allow decoding one slice without the others
an additional slice size field is added to make it possible to find
slices within corrupted surroundings.
these add up to about 57bit per slice more
at 50 frames and 4 slices thats 1425 byte
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 17:33:53 +02:00
Thilo Borgmann
78d2a781d0
fate: Add EXIF test.
2013-08-20 18:47:20 +02:00
Michael Niedermayer
f4f6eb5b74
fate: add ffv1.0 test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-18 13:01:44 +02:00
Nicolas George
d5f38847f5
tests/fli: avoid rounding errors in -t option.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 20:17:10 +02:00
Anton Khirnov
fa09e76010
FATE: add a TAK test
2013-08-08 22:59:42 +02:00
James Almer
1ca3902726
fate: Add vorbiscomment cover art test
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 10:48:37 +02:00
Nedeljko Babic
18d7074b4e
libavcodec: Implementation of 32 bit fixed point FFT
...
Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-04 14:01:41 +02:00
Michael Niedermayer
dc737f0bfa
Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7'
...
* commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7':
fate: Add tree test
Conflicts:
tests/fate/libavutil.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 11:13:34 +02:00
Michael Niedermayer
4cf6e00081
Merge commit 'c47037c7a17e4026d38dfa41da27b9f91506725b'
...
* commit 'c47037c7a17e4026d38dfa41da27b9f91506725b':
fate: Add timefilter test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 10:36:04 +02:00
Diego Biurrun
711c4da1af
fate: Add tree test
2013-07-29 19:20:28 +02:00
Diego Biurrun
c47037c7a1
fate: Add timefilter test
2013-07-29 19:20:27 +02:00
Michael Niedermayer
17b98c1abd
fate: fix stereo3d
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 22:10:38 +02:00
Paul B Mahol
673d4e82d4
fate: add tests for stereo3d filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-13 05:41:04 +00:00
Michael Niedermayer
bc82405188
Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'
...
* commit '52ea29867070243385220a223d7512ea7d4ae2d2':
fate: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 14:51:24 +02:00
Sean McGovern
52ea298670
fate: use current syntax for the scale filter
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-12 11:08:25 +03:00
Michael Niedermayer
7dee9c2268
tests/fate/filter-audio: update asyncts reference
...
The new reference matches the one used by qatar
Fixes: fate-filter-asyncts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 19:44:27 +02:00
Michael Niedermayer
5312c319be
avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases
...
This fixes speex in rtmp
Fixes Ticket2409
the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration
If this causes any problems, like premature analyze/probe end, please report!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 02:37:24 +02:00
Michael Niedermayer
7bd417c22a
Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'
...
* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
tests: Only run noproxy test if networking is enabled
fifo: K&R formatting cosmetics
Conflicts:
libavformat/Makefile
libavutil/fifo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07 11:26:28 +02:00
Diego Biurrun
6516632967
tests: Only run noproxy test if networking is enabled
2013-07-06 15:36:57 +02:00
Derek Buitenhuis
11081ab6be
fate: Add Canopus Lossless YUY2 test
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 11:26:23 +02:00
Derek Buitenhuis
b6507930ac
fate: Add Canopus Lossless YUY2 test
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-06-24 18:26:08 -04:00
James Almer
99b8cd0c81
lavu: Add RIPEMD hashing
...
Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320
Signed-off-by: James Almer <jamrial@gmail.com>
2013-06-15 18:54:01 -03:00
Stefano Sabatini
6397264e84
tests: add filter-pixfmts-rotate test
2013-06-13 01:21:47 +02:00
Paul B Mahol
0354bc39eb
fate: wavpack: add more dependencies
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-11 20:50:42 +00:00
James Almer
682b2273e8
lavu: Add SHA-2 512 hashing
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-02 11:27:19 +02:00
Michael Niedermayer
5711e4fd11
fate: use TARGET_SAMPLES in mcdeint tests
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-02 02:03:39 +02:00
Stefano Sabatini
5fa252b212
tests: add mcdeint tests
2013-06-01 22:35:04 +02:00
Michael Niedermayer
9d56ccf5af
j2k/jpeg2000dec: merge
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-31 03:10:08 +02:00
Michael Niedermayer
63e5e9f7c5
fate: fix smvjpeg test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-30 03:31:04 +02:00
Ash Hughes
fa30f4c24d
fate: add smv test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-30 03:00:05 +02:00
Michael Niedermayer
d9cde3976c
Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'
...
* commit '2d2d6a4883479403798f4ed46941d5b365823570':
lavf: add a raw WavPack muxer.
apetag: add support for writing APE tags
matroskaenc: support muxing WavPack
Conflicts:
libavformat/Makefile
libavformat/allformats.c
libavformat/apetag.h
libavformat/version.h
libavformat/wvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 10:40:42 +02:00
Michael Niedermayer
1f5e5d2205
Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
...
* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
fate: Add a --target-samples path parameter
Conflicts:
configure
tests/fate/audio.mak
tests/fate/cover-art.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/filter-video.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/prores.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vpx.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 04:25:37 +02:00
Michael Niedermayer
e755c8ac46
Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
...
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
fate: Don't use files from SRC_PATH in the actual tests
indeo4: reuse context block VLC for band instead of defaulting
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 04:02:23 +02:00
Anton Khirnov
01656fd476
matroskaenc: support muxing WavPack
2013-05-28 18:18:57 +02:00
Martin Storsjö
ba13606ca6
fate: Add a --target-samples path parameter
...
This allows having the samples accessible via different paths
on the target and on the host.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-28 17:16:54 +03:00
Martin Storsjö
4a27a52a1f
fate: Don't use files from SRC_PATH in the actual tests
...
If building out of tree, make sure the filter scripts are copied
into the build tree before running tests. This makes sure that
SRC_PATH doesn't need to exist on the remote system (or doesn't
need to exist at the same path).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-28 17:14:18 +03:00
Michael Niedermayer
ee189701a6
j2kenc: Allow encoding with the 9/7 wavelet
...
Also add a fate test that tests 9/7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 18:50:18 +02:00
Michael Niedermayer
029353e427
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
...
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
Monkey's Audio old versions FATE tests
h264_parser: Set field_order and picture_structure.
Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 12:15:56 +02:00
Kostya Shishkov
e9e5a1bdc7
Monkey's Audio old versions FATE tests
2013-05-24 09:04:18 +02:00
Carl Eugen Hoyos
898268a23b
Add a fate test for ProRes Transparency.
2013-05-21 23:09:19 +02:00
Michael Niedermayer
0a8e86faf2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Escape 130 FATE test
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 11:06:39 +02:00
Michael Niedermayer
fa6001e728
Merge commit '8e673efc6f5b7a095557664660305148f2788d30'
...
* commit '8e673efc6f5b7a095557664660305148f2788d30':
prores: update FATE test to account for alpha plane present in the test sample
configure: Add basic valgrind-massif support
Conflicts:
tests/fate/prores.mak
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:53:39 +02:00
Kostya Shishkov
e45d6222cc
Escape 130 FATE test
2013-05-19 07:09:36 +02:00
Kostya Shishkov
8e673efc6f
prores: update FATE test to account for alpha plane present in the test sample
2013-05-19 07:09:23 +02:00
Clément Bœsch
5c7a33a716
fate/colorchannelmixer: make sure direct path is tested.
2013-05-16 13:18:08 +02:00
Michael Niedermayer
f268727a8f
fate: change colorchannelmixers coefficients to be less unstable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 12:49:11 +02:00
Reimar Döffinger
86215c326e
Add 128 bit murmur3 hash function.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-13 21:42:37 +02:00
Michael Niedermayer
45150f90e7
fate: fix filter-colorchannelmixer by adding bitexact & accurate flags
...
Idea by durandal11707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 17:15:58 +02:00
Paul B Mahol
2dedd8988a
fate: add colorchannelmixer test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-13 10:57:48 +00:00
Paul B Mahol
87888c043d
fate: add exr tests
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 11:47:30 +00:00
Clément Bœsch
9b11c2ef36
fate/filter: test hqdn3d timeline.
2013-05-12 13:07:47 +02:00
James Almer
67fad0d221
ADPCM IMA Radical decoder
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:53:50 -03:00
James Almer
e5e86db178
RedSpark demuxer
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:53:02 -03:00
James Almer
d3710c51d9
RSD demuxer
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:52:10 -03:00
James Almer
b4866f717c
ADP demuxer
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:10:52 -03:00
Carl Eugen Hoyos
43b6482d0a
Add fate test for solid colour lagarith frames.
2013-05-09 17:18:12 +02:00
Paul B Mahol
d1cb559a6a
fate: add test for lut filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-09 10:37:58 +00:00
Michael Niedermayer
9818bbde53
Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'
...
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
nut: use meaningful error values
FATE: use a less ambiguous end time for filter-trim-time test
Conflicts:
libavformat/nutdec.c
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 12:47:54 +02:00
Anton Khirnov
cd4bfe3a50
FATE: use a less ambiguous end time for filter-trim-time test
...
0.1 seconds at 25 fps is exactly 2.5 frames, which may be rounded either
to 2 or 3 on different platforms.
2013-05-07 12:33:13 +02:00
Michael Niedermayer
9276467bce
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate-jpeg2000-dcinema: force output to xyz12le
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 11:35:07 +02:00
Reimar Döffinger
399f6ef971
Add FATE test for matroska error recovery.
...
This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-07 05:30:19 +02:00
Janne Grunau
851465f9d9
fate-jpeg2000-dcinema: force output to xyz12le
...
Fixes Fate tests on big-endian configs.
2013-05-06 21:48:15 +02:00
Michael Niedermayer
2e2b6d7ab3
fate: Adjust filter-trim-time parameters
...
This should workaround rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 00:26:35 +02:00
Michael Niedermayer
3319679d0a
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
...
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 11:34:34 +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
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
a1e05b0487
lavfi: add trim and atrim filters.
2013-04-30 11:24:57 +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
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
e881057c98
fate: add a rule for pixfmts tests.
2013-04-30 01:47:53 +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
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
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
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
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
Michael Niedermayer
54429142c5
fate: re-enable jpeg2000 test with rgb48le
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:31:52 +02:00
Michael Niedermayer
42a7938cca
fate: temporary disable jpeg2000 test to avoid fate breakage from next commits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:19:03 +02:00
Michael Niedermayer
b4fc2a10df
fate: fix jpeg2000 on big endian
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 15:54:02 +02:00
Michael Niedermayer
124244ec48
Merge commit 'b963f021b603509b5159873de4919dec441d0782'
...
* commit 'b963f021b603509b5159873de4919dec441d0782':
fate: Invoke pixfmts lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:34:23 +02:00
Michael Niedermayer
191430a28f
Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'
...
* commit '28663511c99b3cdaf9387a15032259879474f5f4':
fate: Invoke pixdesc lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:00:04 +02:00
Michael Niedermayer
506ebdac2a
Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'
...
* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d':
fate: Invoke standard lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 12:34:55 +02:00
Diego Biurrun
b963f021b6
fate: Invoke pixfmts lavfi tests through fate-run.sh
2013-04-27 16:53:42 +02:00
Diego Biurrun
28663511c9
fate: Invoke pixdesc lavfi tests through fate-run.sh
2013-04-27 16:53:42 +02:00
Diego Biurrun
03b052c023
fate: Invoke standard lavfi tests through fate-run.sh
2013-04-27 16:53:42 +02:00
Michael Niedermayer
3fa6c992d9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
Conflicts:
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 11:35:03 +02:00
Diego Biurrun
7c00e9d8ae
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
...
The function requires increasing the fuzz factor for the ac3/eac3 encode
tests and even so makes fate fail. It only provides a slight encoding
speedup for legacy CPUs that do not support SS2. Thus its benefit is not
worth the trouble it creates and fixing it would be a waste of time.
2013-04-26 21:06:52 +02:00
Michael Niedermayer
667159e718
fate: re-enable fate-acodec-dca2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 23:23:12 +02:00
Paul B Mahol
084709f6a5
fate: update dca test and disable dca2 test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 18:39:30 +00:00
Michael Niedermayer
575399c7e1
Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
...
* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
fate: add CVFC1_Sony_C to h264 conformance tests
doc/APIchanges: add missing hashes and dates
Conflicts:
doc/APIchanges
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 09:54:11 +02:00
Nicolas George
70feca926b
lavc: check decoded subtitles encoding.
...
Address trac ticket #2431 .
2013-04-24 19:41:27 +02:00
Vittorio Giovara
fc18cc44eb
fate: add CVFC1_Sony_C to h264 conformance tests
...
The sample is already included in the FATE suite, but is not tested
because cropping wasn't fully supported before.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-24 17:44:11 +02:00
Michael Niedermayer
e2e9bee2da
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avcodec: Bump minor for JPEG 2000 decoder
JPEG 2000 decoder for DCinema
The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mqc.c
libavcodec/mqc.h
libavcodec/mqcdec.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 20:00:54 +02:00
Michael Niedermayer
c1c2b0b339
avcodec: rename jpeg2000 decoder to j2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 19:28:33 +02:00
Nicolas Bertrand
c81a706381
JPEG 2000 decoder for DCinema
...
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-22 15:38:29 +02:00
Michael Niedermayer
80d4d3a41d
fate: re-enable af_join test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 14:54:38 +02:00
Michael Niedermayer
e4c0f258d3
Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'
...
* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
afifo: fix request_samples on the last frame in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 13:02:29 +02:00
Anton Khirnov
9bfc6e02ba
afifo: fix request_samples on the last frame in certain cases
...
The current code can fail to return the last frame if it contains
exactly the requested number of samples.
Fixes the join filter test, which previously did not include the last
408 samples in most cases.
CC:libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-22 02:29:56 +02:00
Michael Niedermayer
8f116bf71b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: cosmetics: More sensible order for entries in video filter file
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 23:34:58 +02:00
Michael Niedermayer
e07e8882ae
Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'
...
* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a':
fate: Rename video filters file and add separate video filters target
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 23:26:55 +02:00
Michael Niedermayer
6c5989cce9
Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'
...
* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
fate: Split audio filters into their own separate file
Conflicts:
tests/Makefile
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 23:13:20 +02:00
Michael Niedermayer
4cb59ad84b
Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'
...
* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
fate: Reuse VREF and AREF variables where appropriate
Conflicts:
tests/fate/filter.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 22:55:21 +02:00
Diego Biurrun
bc7fbd36ea
fate: cosmetics: More sensible order for entries in video filter file
2013-04-19 18:07:48 +02:00
Diego Biurrun
a77aed142c
fate: Rename video filters file and add separate video filters target
2013-04-19 18:07:48 +02:00
Diego Biurrun
b357f1d1d3
fate: Split audio filters into their own separate file
2013-04-19 18:07:48 +02:00
Diego Biurrun
3eec1d41b4
fate: Reuse VREF and AREF variables where appropriate
2013-04-19 18:07:48 +02:00
Clément Bœsch
3d786591b8
fate/gif: create meaningful gif encoding tests.
2013-04-19 02:05:01 +02:00
Clément Bœsch
3db3b278f2
lavfi/lut: add direct path.
2013-04-17 19:18:08 +02:00
Michael Niedermayer
7e20f80d2c
fate: fix histogram test, try #2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 03:52:51 +02:00
Michael Niedermayer
7ed691e2db
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: Set the bitexact flag for vp3/vp5/vp6 tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 01:02:14 +02:00
Paul B Mahol
a4f03f082b
FATE: add a test for the histogram filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-15 16:40:26 +00:00
Martin Storsjö
6add6272da
fate: Set the bitexact flag for vp3/vp5/vp6 tests
...
This is required since there are bit-inexact implementations
of the vp3 idct (for bfin).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-15 14:19:16 +03:00
Michael Niedermayer
ebbd4fd5f0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
FATE: add a test for the interlace filter
lavfi: new interlace filter
Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 16:32:33 +02:00
Michael Niedermayer
b3c3996212
avcodec: rename prores encoders
...
Using the first names of authors sounds somewhat unprofessional
and might be considered offensive which is not intended.
The new names use the initials of the authors due to simplicity
and the possibility to apply it consistently without the need
to find political correct names for each future case where
alternative codecs might exist. Also its shorter ...
If someone has a better idea, like maybe 2 random letters
and people prefer it then iam happy to switch to that ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:13:34 +02:00
Vittorio Giovara
25882a7ff6
FATE: add a test for the interlace filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-11 21:33:58 +02:00
Nicolas George
08dd2c9df1
fate: add tests for unknown channel layouts.
2013-04-11 13:09:33 +02:00
Paul B Mahol
11d7bbb47a
fate: add coverage for background disposal in gif decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-06 11:20:27 +00:00
Clément Bœsch
eb054a9693
fate/filter: use aperms to test volume filter.
2013-03-31 11:58:20 +02:00
Clément Bœsch
ef4020ca7d
fate/filter: move gradfun filtergraph to a dedicated script.
2013-03-28 17:44:22 +01:00
Clément Bœsch
0adc93ba2b
fate/filter: move concat filtergraph to a dedicated script.
2013-03-28 17:44:22 +01:00
Clément Bœsch
b1213c911c
fate/filter: move some CMD below deps for consistency.
2013-03-28 17:44:22 +01:00
Clément Bœsch
7f19fc99e0
fate/filter: remove pointless indirections for gradfun and hqdn3d.
2013-03-28 17:44:22 +01:00
Clément Bœsch
4694af1088
fate/filter: rename 'ubitux' rules to 'sample'.
2013-03-28 17:44:18 +01:00
Clément Bœsch
ac00755e0a
fate/filter: stick delogo test with its deps (cosmetics).
2013-03-28 17:37:53 +01:00
Michael Niedermayer
e14f8bd07e
fate: Disable af_join test, as its output is not deterministic currently
...
The reason for the failure is unknown, this needs to be debuged and fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 15:29:21 +01:00
Michael Niedermayer
37bdf33cff
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vmdav: convert to bytestream2
FATE: add a test for the join filter
FATE: add a test for the volume filter
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 15:02:49 +01:00
Michael Niedermayer
7a14564b2d
Merge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'
...
* commit '43a8333a16c796b3d855fb3aaa742103cb62731f':
FATE: add a test for the channelsplit filter
FATE: add a test for the channelmap filter
FATE: add a test for the negate filter
FATE: add a test for the overlay filter
Conflicts:
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 14:29:01 +01:00
Michael Niedermayer
8823ec4f9e
Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'
...
* commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a':
FATE: add a test for the setpts filter
FATE: add a test for the hqdn3d filter
FATE: add a test for the transpose filter
FATE: add a test for the unsharp filter
Conflicts:
tests/ref/fate/filter-hqdn3d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 14:05:22 +01:00
Michael Niedermayer
6f1a6a9f6b
Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'
...
* commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497':
FATE: add a test for the fade filter
FATE: add a test for the drawbox filter
FATE: add a test for the boxblur filter
FATE: add a test for the gradfun filter
Conflicts:
tests/fate/filter.mak
tests/ref/fate/filter-gradfun
our gradfun test is renamed to gradfun-ubitux as its name conflicts and
it was requested to be kept. Feel free to rename, change, finetune ...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:48:05 +01:00
Michael Niedermayer
ac1a1fd708
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
...
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
lavfi/gradfun: remove rounding to match C and SSE code.
lavfi/gradfun: fix dithering in MMX code.
lavfi/gradfun: fix rounding in MMX code.
lavfi/gradfun: do not increment DC pointer for odd values.
fate: filter: Add dependencies
avconv: add options for reading filtergraphs from a file.
Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:00:39 +01:00
Anton Khirnov
8a2f5f0c63
FATE: add a test for the join filter
2013-03-28 08:03:43 +01:00
Anton Khirnov
9e9cd98aed
FATE: add a test for the volume filter
2013-03-28 08:03:31 +01:00
Anton Khirnov
43a8333a16
FATE: add a test for the channelsplit filter
2013-03-28 08:03:12 +01:00
Anton Khirnov
33942b7bde
FATE: add a test for the channelmap filter
2013-03-28 08:02:55 +01:00
Anton Khirnov
f917420378
FATE: add a test for the negate filter
2013-03-28 08:02:47 +01:00
Anton Khirnov
3d8c80b611
FATE: add a test for the overlay filter
2013-03-28 08:01:58 +01:00
Anton Khirnov
ea290d919a
FATE: add a test for the setpts filter
2013-03-28 08:01:46 +01:00
Anton Khirnov
71f3ede24e
FATE: add a test for the hqdn3d filter
2013-03-28 08:01:41 +01:00
Anton Khirnov
0bdbd85e47
FATE: add a test for the transpose filter
2013-03-28 08:01:34 +01:00
Anton Khirnov
ad85e8d9a5
FATE: add a test for the unsharp filter
2013-03-28 08:01:26 +01:00
Anton Khirnov
1a6d4bd7b6
FATE: add a test for the fade filter
2013-03-28 08:01:13 +01:00
Anton Khirnov
feb4922b25
FATE: add a test for the drawbox filter
2013-03-28 08:01:07 +01:00
Anton Khirnov
a222997650
FATE: add a test for the boxblur filter
2013-03-28 08:00:58 +01:00
Anton Khirnov
7cec12748a
FATE: add a test for the gradfun filter
2013-03-28 08:00:24 +01:00
Diego Biurrun
f2a59722d1
fate: filter: Add dependencies
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:58:44 +01:00
Clément Bœsch
183f3450fd
lavfi/curves: support preset shorthand.
2013-03-26 00:04:06 +01:00
Clément Bœsch
dc65d784df
lavfi/curves: add presets support.
...
Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
2013-03-25 23:48:51 +01:00
Nicolas George
57cb4fb075
lavfi: add test for concat.
2013-03-24 23:16:40 +01:00
Michael Niedermayer
7239b36059
fate: dont try to filter partial frames with yadif.
...
The partial frames leak a few uninitialized pixels through
due to incomplete interlaced error concealment support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-24 01:30:11 +01:00
Janne Grunau
70db0c9156
fate: use little endian yuv444p10 in h264-reinit tests
...
Fixes fate big endian configs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 22:33:11 +01:00
Janne Grunau
535c247b57
fate: use little endian yuv444p10 in h264-reinit tests
...
Fixes fate big endian configs.
2013-03-23 13:12:36 +01:00
Michael Niedermayer
8b63eeb6b1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add test for cropping h264 to container dimensions
FATE: add a tscc2 test.
tscc2: allocate AVFrame properly.
Conflicts:
libavcodec/tscc2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 12:26:08 +01:00
Janne Grunau
3f15b301fa
fate: add test for cropping h264 to container dimensions
...
Tests the workaround added for 1080 videos created with Canon cameras
in 30f515091c
.
2013-03-22 21:58:01 +01:00
Anton Khirnov
93eaeb0244
FATE: add a tscc2 test.
2013-03-22 20:10:56 +01:00
Michael Niedermayer
6c8ac2d782
Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'
...
* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
fate: add tests for h264 decoder reinit
h264: fix bit depth changes with frame threading
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21 11:56:29 +01:00
Janne Grunau
1c4073efd2
fate: add tests for h264 decoder reinit
2013-03-20 16:04:27 +01:00
Clément Bœsch
17e1b3cd14
fate: make metadata fate tests only output ts and metadata.
...
The other information are just cluttering the output. The command line
is also simplified in the process.
2013-03-20 00:09:44 +01:00
Clément Bœsch
879ca313c0
fate: add missing filter dep in metadata tests.
2013-03-19 17:39:08 +01:00
Clément Bœsch
bf0e44fa67
fate: add curves filter test.
2013-03-19 16:20:22 +01:00
Clément Bœsch
21aa4fafcd
fate: add ebur128 metadata test.
2013-03-19 14:37:59 +01:00
Nicolas George
ec7fc7b7d1
fate: add a test for -filter_complex / -lavfi without input.
2013-03-17 16:24:43 +01:00
Clément Bœsch
e1b1092755
fate: test both direct and indirect paths in delogo filter.
2013-03-16 16:22:56 +01:00
Clément Bœsch
8a0187e43d
fate: test both direct and indirect paths in hqdn3d and gradfun.
2013-03-16 16:04:59 +01:00
Michael Niedermayer
c51fcdf0f6
Merge commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460'
...
* commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460':
avconv: fix a typo
FATE: replace -vb with -b:v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:15:21 +01:00
Michael Niedermayer
771919e11f
Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'
...
* commit '6deae8e0530a885b76f149841ed4899cb438ec23':
FATE: remove the -dct option from some decoding tests.
avconv: use a local variable for InputFile in open_input_file().
Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:06:30 +01:00
Michael Niedermayer
b36095ea0f
Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'
...
* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
xxan: fix invalid memory access in xan_decode_frame_type0()
tty: set avg_frame_rate.
FATE: enable multiple slices in the ffv1 vsynth test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:57:28 +01:00
Nicolas George
f9b34b8bf9
ffmpeg: port sub2video to AVFrame.
...
And re-enable the FATE test.
2013-03-10 13:45:15 +01:00
Michael Niedermayer
b1b506bc56
fate: disable sub2video
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 01:41:52 +01:00
Carl Eugen Hoyos
982070c113
Add some fate dependencies to fix make fate with --disable-everything.
2013-03-09 15:46:46 +01:00
Carl Eugen Hoyos
881684e27c
Add some fate dependencies to fix make fate with --disable-avdevice.
2013-03-09 14:39:13 +01:00
Michael Niedermayer
e92ba51fd7
Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'
...
* commit '65f1d45dcc71186ede72fff950996099d23359bd':
lavu: add support for atomic operations.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 15:48:27 +01:00
Anton Khirnov
64bfc3e205
FATE: replace -vb with -b:v
...
The -{vas}<option> syntax is now obsolete and deprecated, and has never
been documented or encouraged.
2013-03-08 14:14:17 +01:00
Anton Khirnov
6deae8e053
FATE: remove the -dct option from some decoding tests.
...
It is an encoding option, it has no effect when applied to decoding.
2013-03-08 14:14:05 +01:00
Anton Khirnov
bde48aa92d
FATE: enable multiple slices in the ffv1 vsynth test
...
This allows us to test the slice threading code.
2013-03-08 08:10:52 +01:00
Ronald S. Bultje
65f1d45dcc
lavu: add support for atomic operations.
...
These could be used for reference counting, or for keeping track of
decoding progress in references in multithreaded decoders.
Support is provided by gcc/msvc/suncc intrinsics, with a fallback using
pthread mutexes.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-08 07:32:36 +01:00
Carl Eugen Hoyos
a21fd66027
Add dependencies for the voice fate tests.
2013-03-08 02:45:27 +01:00
Carl Eugen Hoyos
0edfda7977
Add dependencies for the flac encoding fate tests.
2013-03-08 02:44:46 +01:00
Carl Eugen Hoyos
53e3bc3024
Add dependencies for the aac encoding fate tests.
2013-03-08 02:44:07 +01:00
Stefano Sabatini
aba18c5af9
tests: add overlay rgb and yuv444 tests
...
Also rename overlay test to overlay_yuv420 accordingly.
2013-03-05 13:20:13 +01:00
Paul B Mahol
d2b0b839b9
fate: add dependency for xface
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-05 11:44:58 +00:00
Michael Niedermayer
06ad309ab4
Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'
...
* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
configure: Fix silly typo in logging command of check_struct()
fate: remove last incomplete frame from mpeg2-field-enc test
Conflicts:
tests/fate/video.mak
tests/ref/fate/mpeg2-field-enc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-05 12:11:48 +01:00