]>
git.sesse.net Git - ffmpeg/log
Carl Eugen Hoyos [Thu, 2 May 2013 09:04:57 +0000 (11:04 +0200)]
Add wmv2 dependency to vc1 compilation.
Fixes compilation with --disable-everything --enable-decoder=vc1.
Michael Niedermayer [Thu, 2 May 2013 00:16:41 +0000 (02:16 +0200)]
avcodec/ansi: Fix right/bottom end checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 00:15:03 +0000 (02:15 +0200)]
avcodec/ansi: Check x/y
This prevents out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 21:46:38 +0000 (23:46 +0200)]
vmdav: Try to fix unpack_rle()
This fixes out of array accesses
The code prior to this commit could not have worked, thus obviously
was untested. I was also not able to find a valid sample that uses this
code.
This fix is thus only based on the description of the format
If someone has a sample that uses unpack_rle(), please mail me.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 18:16:19 +0000 (20:16 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: copy subtitle_header when copying context.
lavf: data muxer and demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:33:30 +0000 (18:33 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: doxy: Small clarification for av_buffer_create()
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Conflicts:
libavutil/buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:28:48 +0000 (18:28 +0200)]
Merge commit '
e926b5ceb1962833f0c884a328382bc2eca67aff '
* commit '
e926b5ceb1962833f0c884a328382bc2eca67aff ':
avformat: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavformat/audiointerleave.c
libavformat/mux.c
libavformat/mxfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:21:29 +0000 (18:21 +0200)]
Merge commit '
7f75f2f2bd692857c1c1ca7f414eb30ece3de93d '
* commit '
7f75f2f2bd692857c1c1ca7f414eb30ece3de93d ':
ppc: Drop unnecessary ff_ name prefixes from static functions
x86: Drop unnecessary ff_ name prefixes from static functions
arm: Drop unnecessary ff_ name prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:16:32 +0000 (18:16 +0200)]
Merge commit '
088f38a4f9f54bb923405c67c9e72d96d90aa284 '
* commit '
088f38a4f9f54bb923405c67c9e72d96d90aa284 ':
avcodec: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavcodec/ass.c
libavcodec/h264_parser.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:08:13 +0000 (18:08 +0200)]
Merge commit '
38282149b6ce8f4b8361e3b84542ba9aa8a1f32f '
* commit '
38282149b6ce8f4b8361e3b84542ba9aa8a1f32f ':
ppc: More consistent arch initialization
Conflicts:
libavcodec/fft.h
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:02:36 +0000 (18:02 +0200)]
Merge commit '
42b9150b0d4f0a130c1d93dc991fd5412743a8cf '
* commit '
42b9150b0d4f0a130c1d93dc991fd5412743a8cf ':
fft: Remove pointless #ifdefs around function declarations
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Conflicts:
libavcodec/fft.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 15:57:52 +0000 (17:57 +0200)]
Merge commit '
f5eecee865a731d2412fde2f73c29f8f8115c499 '
* commit '
f5eecee865a731d2412fde2f73c29f8f8115c499 ':
ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 15:53:27 +0000 (17:53 +0200)]
Merge commit '
6b110d3a739c31602b59887ad65c67025df3f49d '
* commit '
6b110d3a739c31602b59887ad65c67025df3f49d ':
ppc: More consistent names for H.264 optimizations files
mpegaudiosp: More consistent names for ppc/x86 optimization files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 15:45:33 +0000 (17:45 +0200)]
sws: share xyzgamma tables.
They are currently always constant and thus theres no point to
store them in the context.
This makes the context 16kb smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 12:35:02 +0000 (14:35 +0200)]
Merge commit '
8cd472d3f947a6233e7dc628f0dc71c74e62413a '
* commit '
8cd472d3f947a6233e7dc628f0dc71c74e62413a ':
avconv: make output -ss insert trim/atrim filters.
Conflicts:
Changelog
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 12:12:04 +0000 (14:12 +0200)]
Merge commit '
a83c0da539fb07260310bc3b34056239d2b138b2 '
* commit '
a83c0da539fb07260310bc3b34056239d2b138b2 ':
avconv: make -t insert trim/atrim filters.
The filter insertion code is merged but disabled as it is buggy.
For example it fails in various ways when used with -s with some files.
Also the trimming is arguably less accurate than the default without
filters in some cases.
These issues should be fixed before auto inserting the filters,
until then the user can explicitly add a trim/atrim filter when one is
wanted.
Conflicts:
Changelog
ffmpeg.c
ffmpeg_filter.c
tests/ref/fate/bethsoft-vid
tests/ref/lavf/aiff
tests/ref/lavf/asf
tests/ref/lavf/au
tests/ref/lavf/avi
tests/ref/lavf/dpx
tests/ref/lavf/ffm
tests/ref/lavf/gxf
tests/ref/lavf/jpg
tests/ref/lavf/mkv
tests/ref/lavf/mmf
tests/ref/lavf/mov
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/pcx
tests/ref/lavf/png
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
tests/ref/lavf/wav
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 11:17:48 +0000 (13:17 +0200)]
avfilter/trim: improve rounding precission
Note, the design is still flawed, dont expect this to be frame
accurate. float/double first needs to be removed and frames
itself trimmed instead of drop vs nodrop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 1 May 2013 11:13:49 +0000 (13:13 +0200)]
fate/pixfmts: use the appropriate variable names for temporary files.
${1} is now the filter args and is inappropriate as a unique name for
the test (and causes some FATE issues because of the ':' in them).
${filter} is not used either to replace the ${1} because ${outfile}
already contains a unique name for the test.
Michael Niedermayer [Wed, 1 May 2013 10:09:07 +0000 (12:09 +0200)]
Merge commit '
3d624420086ed3cd0c74f4510f0285968e21c117 '
* commit '
3d624420086ed3cd0c74f4510f0285968e21c117 ':
avconv_opt: allocate an OutputFile before the streams.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 23 Apr 2013 18:18:00 +0000 (20:18 +0200)]
lavc: copy subtitle_header when copying context.
Fix trac ticket #2489.
Nicolas George [Mon, 29 Apr 2013 18:46:00 +0000 (20:46 +0200)]
lavf: data muxer and demuxer.
Allow to use tools designed to work with demuxers, muxers
and packets (for example ffmpeg itself) to process raw byte
streams (like aviocat).
Michael Niedermayer [Wed, 1 May 2013 09:26:53 +0000 (11:26 +0200)]
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>
Michael Niedermayer [Wed, 1 May 2013 08:59:21 +0000 (10:59 +0200)]
Merge commit '
b472938233b98178ed6c1353c37e0dc7ab585902 '
* commit '
b472938233b98178ed6c1353c37e0dc7ab585902 ':
lavfi: add an asetpts filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 08:24:45 +0000 (10:24 +0200)]
Merge commit '
2548834b2248ad4d7da9bd0afed09d7d0cddeeb0 '
* commit '
2548834b2248ad4d7da9bd0afed09d7d0cddeeb0 ':
vf_setpts: cosmetics, reformat
Conflicts:
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 08:16:27 +0000 (10:16 +0200)]
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>
Michael Niedermayer [Wed, 1 May 2013 08:11:01 +0000 (10:11 +0200)]
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>
Michael Niedermayer [Wed, 1 May 2013 07:59:57 +0000 (09:59 +0200)]
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>
Michael Niedermayer [Wed, 1 May 2013 07:51:37 +0000 (09:51 +0200)]
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>
Michael Niedermayer [Wed, 1 May 2013 07:45:04 +0000 (09:45 +0200)]
Merge commit '
95220be1faac628d849a004644c0d102df0aa98b '
* commit '
95220be1faac628d849a004644c0d102df0aa98b ':
indeo3: fix off by one in MV validity check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 1 May 2013 02:46:12 +0000 (04:46 +0200)]
doc/filters: fix scale example equivalence.
scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...
Clément Bœsch [Wed, 1 May 2013 02:44:23 +0000 (04:44 +0200)]
doc/filters: replace hqdn3d with smartblur in timeline section.
hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).
Michael Niedermayer [Tue, 30 Apr 2013 21:51:30 +0000 (23:51 +0200)]
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>
Michael Niedermayer [Tue, 30 Apr 2013 21:49:56 +0000 (23:49 +0200)]
h264: assert that croping values at slice level are consistent
These values where checked before already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Apr 2013 21:48:53 +0000 (23:48 +0200)]
h264_ps: check croping values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Apr 2013 18:05:31 +0000 (20:05 +0200)]
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>
Derek Buitenhuis [Mon, 29 Apr 2013 02:23:45 +0000 (22:23 -0400)]
avutil: doxy: Small clarification for av_buffer_create()
Explicitly saying it can't hurt.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 29 Apr 2013 02:15:34 +0000 (22:15 -0400)]
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 29 Apr 2013 02:13:21 +0000 (22:13 -0400)]
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diego Biurrun [Sat, 20 Apr 2013 19:47:15 +0000 (21:47 +0200)]
avformat: Drop unnecessary ff_ name prefixes from static functions
Diego Biurrun [Sat, 20 Apr 2013 19:48:29 +0000 (21:48 +0200)]
ppc: Drop unnecessary ff_ name prefixes from static functions
Diego Biurrun [Sat, 20 Apr 2013 20:15:22 +0000 (22:15 +0200)]
x86: Drop unnecessary ff_ name prefixes from static functions
Diego Biurrun [Sat, 20 Apr 2013 19:49:09 +0000 (21:49 +0200)]
arm: Drop unnecessary ff_ name prefixes from static functions
Diego Biurrun [Sat, 20 Apr 2013 19:51:11 +0000 (21:51 +0200)]
avcodec: Drop unnecessary ff_ name prefixes from static functions
Michael Niedermayer [Tue, 30 Apr 2013 11:13:40 +0000 (13:13 +0200)]
gif: Fix little endian specific code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Apr 2013 09:44:13 +0000 (11:44 +0200)]
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>
Paul B Mahol [Tue, 30 Apr 2013 10:22:16 +0000 (10:22 +0000)]
fate: add test for separatefields filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Sun, 14 Apr 2013 12:47:30 +0000 (14:47 +0200)]
ppc: More consistent arch initialization
Diego Biurrun [Fri, 26 Apr 2013 10:43:11 +0000 (12:43 +0200)]
fft: Remove pointless #ifdefs around function declarations
Diego Biurrun [Fri, 26 Apr 2013 22:35:08 +0000 (00:35 +0200)]
ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs
This prevents non-AltiVec-enabled compilers from choking.
Diego Biurrun [Fri, 26 Apr 2013 22:37:32 +0000 (00:37 +0200)]
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
Diego Biurrun [Sun, 14 Apr 2013 12:42:24 +0000 (14:42 +0200)]
ppc: More consistent names for H.264 optimizations files
Diego Biurrun [Fri, 26 Apr 2013 23:03:37 +0000 (01:03 +0200)]
mpegaudiosp: More consistent names for ppc/x86 optimization files
Paul B Mahol [Tue, 30 Apr 2013 10:18:45 +0000 (10:18 +0000)]
fate: add test for swapuv filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 30 Apr 2013 10:08:42 +0000 (10:08 +0000)]
fate: add test for telecine filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Wed, 10 Apr 2013 13:02:01 +0000 (15:02 +0200)]
avconv: make output -ss insert trim/atrim filters.
This makes output -ss sample-accurate for audio and will allow further
simplication in the future.
Anton Khirnov [Wed, 10 Apr 2013 13:02:01 +0000 (15:02 +0200)]
avconv: make -t insert trim/atrim filters.
This makes -t sample-accurate for audio and will allow further
simplication in the future.
Most of the FATE changes are due to audio now being sample accurate. In
some cases a video frame was incorrectly passed with the old code, while
its was over the limit.
Anton Khirnov [Wed, 10 Apr 2013 12:46:20 +0000 (14:46 +0200)]
avconv_opt: allocate an OutputFile before the streams.
This way OutputFile variables like recording time can be used when
creating the streams.
Anton Khirnov [Tue, 2 Apr 2013 17:30:11 +0000 (19:30 +0200)]
lavfi: add trim and atrim filters.
Anton Khirnov [Wed, 10 Apr 2013 14:28:38 +0000 (16:28 +0200)]
lavfi: add an asetpts filter
Anton Khirnov [Wed, 10 Apr 2013 14:13:50 +0000 (16:13 +0200)]
vf_setpts: cosmetics, reformat
Anton Khirnov [Wed, 10 Apr 2013 10:44:13 +0000 (12:44 +0200)]
graphparser: only print filter arguments if they are non-NULL
Anton Khirnov [Wed, 10 Apr 2013 10:40:04 +0000 (12:40 +0200)]
af_channelmap: ensure the output channel layout is valid.
Anton Khirnov [Wed, 10 Apr 2013 10:28:51 +0000 (12:28 +0200)]
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.
Anton Khirnov [Tue, 9 Apr 2013 20:09:20 +0000 (22:09 +0200)]
vf_split: fix description
It now allows an arbitrary number of inputs, not just two.
Anton Khirnov [Wed, 24 Apr 2013 08:19:54 +0000 (10:19 +0200)]
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.
Paul B Mahol [Fri, 26 Apr 2013 13:17:03 +0000 (13:17 +0000)]
lavfi/stereo3d: add support for alternating frames input & output format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Sat, 27 Apr 2013 18:29:09 +0000 (20:29 +0200)]
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.
Anton Khirnov [Sat, 27 Apr 2013 16:01:51 +0000 (18:01 +0200)]
indeo3: fix off by one in MV validity check
CC:libav-stable@libav.org
Anton Khirnov [Sat, 27 Apr 2013 18:54:55 +0000 (20:54 +0200)]
FATE: add an additional indeo3 test
It is a part of the sample that got broken by recent indeo3 changes.
Michael Niedermayer [Tue, 30 Apr 2013 06:42:04 +0000 (08:42 +0200)]
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>
Michael Niedermayer [Tue, 30 Apr 2013 06:25:18 +0000 (08:25 +0200)]
Merge commit '
85f2f82af66fade2f5af2a03c5011d7de1b6e295 '
* commit '
85f2f82af66fade2f5af2a03c5011d7de1b6e295 ':
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 30 Apr 2013 00:11:03 +0000 (02:11 +0200)]
fate: remove forgotten transpose filter results from old system.
Clément Bœsch [Tue, 30 Apr 2013 00:08:48 +0000 (02:08 +0200)]
fate: port remaining filters to new system.
Merge of
b963f021b603509b5159873de4919dec441d0782 is now complete.
Clément Bœsch [Mon, 29 Apr 2013 23:45:08 +0000 (01:45 +0200)]
fate: move kerndeint test to the new system.
Clément Bœsch [Mon, 29 Apr 2013 23:32:49 +0000 (01:32 +0200)]
fate: port our pixfmts change to fate-run.sh.
This patch is the same as
52b23cbf1c8f276136556c9e2252184b763ae1ec .
Clément Bœsch [Mon, 29 Apr 2013 23:47:42 +0000 (01:47 +0200)]
fate: add a rule for pixfmts tests.
Diego Biurrun [Wed, 10 Apr 2013 23:31:51 +0000 (01:31 +0200)]
x86: dsputil: Remove a set of pointless #ifs around function declarations
Diego Biurrun [Sun, 28 Apr 2013 00:05:58 +0000 (02:05 +0200)]
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
Clément Bœsch [Mon, 29 Apr 2013 23:19:24 +0000 (01:19 +0200)]
fate: fix filtfmts-test dependency after
9a5924f .
Clément Bœsch [Mon, 29 Apr 2013 22:32:04 +0000 (00:32 +0200)]
lavfi: add two opencl headers to SKIPHEADERS.
Fix make checkheaders.
Clément Bœsch [Mon, 29 Apr 2013 20:27:22 +0000 (22:27 +0200)]
fate: add bitexact flags to alphaextract/alphamerge tests.
Should fix a FATE failure.
Clément Bœsch [Mon, 29 Apr 2013 20:19:12 +0000 (22:19 +0200)]
fate: add filters dependencies to pixfmts tests.
Clément Bœsch [Mon, 29 Apr 2013 20:05:57 +0000 (22:05 +0200)]
fate: move a few simple pixfmts tests to the new system.
Michael Niedermayer [Mon, 29 Apr 2013 20:01:47 +0000 (22:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: hpeldsp: Remove unused macro definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 29 Apr 2013 19:34:02 +0000 (21:34 +0200)]
fate: move lavd filters tests to the new system.
Also make life test a bit more useful.
Clément Bœsch [Mon, 29 Apr 2013 19:43:32 +0000 (21:43 +0200)]
fate: remove '#' in filter parameters.
It was considered a comment.
Paul B Mahol [Mon, 29 Apr 2013 13:36:59 +0000 (13:36 +0000)]
lavfi/showwaves: fix crash in case of negative linesize
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 29 Apr 2013 13:31:04 +0000 (13:31 +0000)]
lavfi/showspectrum: fix crash in case of negative linesize
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Mon, 29 Apr 2013 18:59:52 +0000 (20:59 +0200)]
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.
Michael Niedermayer [Mon, 29 Apr 2013 18:25:18 +0000 (20:25 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Recognize j2k as file suffix for the image2 muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 29 Apr 2013 18:11:08 +0000 (20:11 +0200)]
fate: move colormatrix tests to the new system.
Clément Bœsch [Mon, 29 Apr 2013 17:52:23 +0000 (19:52 +0200)]
fate: restore our settings for drawtext/fade/unsharp.
Clément Bœsch [Mon, 29 Apr 2013 17:17:41 +0000 (19:17 +0200)]
fate: move more tests from lavfi-regression.sh to filter-video.mak.
Diego Biurrun [Tue, 23 Apr 2013 14:26:02 +0000 (16:26 +0200)]
x86: hpeldsp: Remove unused macro definitions
Carl Eugen Hoyos [Mon, 29 Apr 2013 11:11:32 +0000 (13:11 +0200)]
Recognize j2k as file suffix for the image2 muxer.
Michael Niedermayer [Mon, 29 Apr 2013 10:26:15 +0000 (12:26 +0200)]
avfilter/vf_tinterlace: fix handling of not so even sizes
Fixes green bottom line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Apr 2013 01:08:50 +0000 (03:08 +0200)]
copy_packet_data: fix memleak
This should fix gif fate memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
highgod0401 [Sun, 28 Apr 2013 03:03:24 +0000 (11:03 +0800)]
lavu/opencl: add check version and platform
Reviewed-by: Hanspeter Niederstrasser <niederstrasser@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Apr 2013 17:57:45 +0000 (19:57 +0200)]
sws: fix typo in xyz2rgb matrix use.
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Apr 2013 17:31:52 +0000 (19:31 +0200)]
fate: re-enable jpeg2000 test with rgb48le
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>