ffmpeg.git
6 years agolavu: define FF_MEMORY_POISON and use it
Stefano Sabatini [Sun, 12 May 2013 11:37:33 +0000 (13:37 +0200)]
lavu: define FF_MEMORY_POISON and use it

Allow single-place definition of constant used to fill poisoned memory.

6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 13 May 2013 11:25:06 +0000 (13:25 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not read strd chunk in avi files as H264 extradata.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add colorchannelmixer test
Paul B Mahol [Mon, 13 May 2013 10:24:16 +0000 (10:24 +0000)]
fate: add colorchannelmixer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoDo not read strd chunk in avi files as H264 extradata.
Carl Eugen Hoyos [Mon, 13 May 2013 10:39:44 +0000 (12:39 +0200)]
Do not read strd chunk in avi files as H264 extradata.

Fixes ticket #2561.

6 years agotests/lavf-regression: fix gbrp10 dpx test on big endian
Paul B Mahol [Mon, 13 May 2013 10:06:35 +0000 (10:06 +0000)]
tests/lavf-regression: fix gbrp10 dpx test on big endian

For some reason only for that pix format decoder picks native format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 13 May 2013 09:36:42 +0000 (11:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: x86: Only enable cpunop on i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'
Michael Niedermayer [Mon, 13 May 2013 09:29:37 +0000 (11:29 +0200)]
Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'

* commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199':
  configure: Rename cmov processor capability to i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e08c946c6860a78b0c479551d5f6735361160cbd'
Michael Niedermayer [Mon, 13 May 2013 09:23:11 +0000 (11:23 +0200)]
Merge commit 'e08c946c6860a78b0c479551d5f6735361160cbd'

* commit 'e08c946c6860a78b0c479551d5f6735361160cbd':
  configure: Explicitly disable PIC when targeting win32/mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121'
Michael Niedermayer [Mon, 13 May 2013 08:53:13 +0000 (10:53 +0200)]
Merge commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121'

* commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121':
  configure: Use enable_weak when enabling pic

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopngenc: Add 'dpi', 'dpm' options
Andrey Utkin [Fri, 10 May 2013 15:45:11 +0000 (18:45 +0300)]
pngenc: Add 'dpi', 'dpm' options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: increase coverage for dpx encoder
Paul B Mahol [Sun, 12 May 2013 22:04:26 +0000 (22:04 +0000)]
fate: increase coverage for dpx encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodpxenc: simplifiy code using AVPixFmtDescriptor
Paul B Mahol [Sun, 12 May 2013 21:27:48 +0000 (21:27 +0000)]
dpxenc: simplifiy code using AVPixFmtDescriptor

Update rgb24 fate test as it no longer writes image in big endian
format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodpxenc: do not set coded_frame
Paul B Mahol [Sun, 12 May 2013 21:15:59 +0000 (21:15 +0000)]
dpxenc: do not set coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosws/output: remove offset/coef for alpha in rgba64
Michael Niedermayer [Sun, 12 May 2013 20:01:18 +0000 (22:01 +0200)]
sws/output: remove offset/coef for alpha in rgba64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: RGBA64 output
Paul B Mahol [Sun, 12 May 2013 18:10:48 +0000 (18:10 +0000)]
swscale: RGBA64 output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: x86: Only enable cpunop on i686
Diego Biurrun [Fri, 26 Apr 2013 14:49:03 +0000 (16:49 +0200)]
configure: x86: Only enable cpunop on i686

The assembler may insert nopl instructions for cpunop, which are not
(universally) supported on i586 CPUs.

6 years agoconfigure: Rename cmov processor capability to i686
Diego Biurrun [Fri, 26 Apr 2013 14:49:02 +0000 (16:49 +0200)]
configure: Rename cmov processor capability to i686

The goal is to make the capapility slightly more general and have it
cover the availability of the nopl instruction in addition to cmov.

6 years agoaacenc: Fix ticket #1784: erasure of surround channels
Claudio Freire [Sun, 12 May 2013 07:38:40 +0000 (09:38 +0200)]
aacenc: Fix ticket #1784: erasure of surround channels

This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.
Test sample attached on the bug tracker had the peculiar case of all
other channels being silent, so the error was far more noticeable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Explicitly disable PIC when targeting win32/mingw
Martin Storsjö [Tue, 7 May 2013 16:25:03 +0000 (19:25 +0300)]
configure: Explicitly disable PIC when targeting win32/mingw

These platforms do not have any notion of PIC. On some compilers,
enabling pic produces a number of warnings.

This avoids trying to produce PIC loads in the ARM assembly - there
are no relocation types in PE/COFF that correspond to
BFD_RELOC_32_PCREL (R_ARM_REL32 in ELF).

As a side-effect, this avoids enabling PIC on mingw64, getting rid
of the warnings about PIC not having any effect on that platform.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: Use enable_weak when enabling pic
Martin Storsjö [Thu, 9 May 2013 12:39:25 +0000 (15:39 +0300)]
configure: Use enable_weak when enabling pic

This allows it to be overridden, either by the user on the command
line, or by other sections of the configure script.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosws/packed_16bpc_bswap: fix handling of negative stride
Michael Niedermayer [Sun, 12 May 2013 15:26:15 +0000 (17:26 +0200)]
sws/packed_16bpc_bswap: fix handling of negative stride

6 years agoRevert "sws: support endianness conversion for AV_PIX_FMT_RGBA64"
Michael Niedermayer [Sun, 12 May 2013 13:05:25 +0000 (15:05 +0200)]
Revert "sws: support endianness conversion for AV_PIX_FMT_RGBA64"

This reverts commit 23f7b14f2851d1d1a969c12b7e337826f0c74a43.

This commit broke fate

6 years agoredspark: fix memleak in redspark_read_header
Paul B Mahol [Sun, 12 May 2013 12:14:33 +0000 (12:14 +0000)]
redspark: fix memleak in redspark_read_header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: add exr tests
Paul B Mahol [Sun, 24 Feb 2013 21:51:31 +0000 (21:51 +0000)]
fate: add exr tests

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosws: support endianness conversion for AV_PIX_FMT_RGBA64
Paul B Mahol [Sun, 12 May 2013 11:44:20 +0000 (11:44 +0000)]
sws: support endianness conversion for AV_PIX_FMT_RGBA64

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/filters: split item options which are not aliases.
Clément Bœsch [Sun, 12 May 2013 11:23:45 +0000 (13:23 +0200)]
doc/filters: split item options which are not aliases.

6 years agofate/filter: test gradfun timeline.
Clément Bœsch [Wed, 8 May 2013 23:52:12 +0000 (01:52 +0200)]
fate/filter: test gradfun timeline.

6 years agofate/filter: test hqdn3d timeline.
Clément Bœsch [Wed, 8 May 2013 23:38:33 +0000 (01:38 +0200)]
fate/filter: test hqdn3d timeline.

6 years agolavfi/hqdn3d: restore timeline feature.
Clément Bœsch [Wed, 8 May 2013 23:13:59 +0000 (01:13 +0200)]
lavfi/hqdn3d: restore timeline feature.

6 years agolavfi/hqdn3d: use macros instead of hardcoded indexes.
Clément Bœsch [Wed, 8 May 2013 23:22:22 +0000 (01:22 +0200)]
lavfi/hqdn3d: use macros instead of hardcoded indexes.

6 years agolavfi: replace passthrough_filter_frame with a flag.
Clément Bœsch [Wed, 8 May 2013 23:04:41 +0000 (01:04 +0200)]
lavfi: replace passthrough_filter_frame with a flag.

With the introduction of AVFilterContext->is_disabled, we can simplify
the custom passthrough mode in filters.

This commit is technically a small compat break, but the timeline was
introduced very recently.

Doxy by Stefano Sabatini.

6 years agolavfi/vflip: use FF_CEIL_RSHIFT for chroma w/h rounding.
Clément Bœsch [Fri, 10 May 2013 23:06:53 +0000 (01:06 +0200)]
lavfi/vflip: use FF_CEIL_RSHIFT for chroma w/h rounding.

6 years agolavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding.
Clément Bœsch [Fri, 10 May 2013 22:56:04 +0000 (00:56 +0200)]
lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding.

6 years agolavfi/select: unbreak compatibility with older PICT_TYPE syntax
Paul B Mahol [Fri, 10 May 2013 17:36:07 +0000 (17:36 +0000)]
lavfi/select: unbreak compatibility with older PICT_TYPE syntax

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'jamrial/adpcm'
Michael Niedermayer [Sat, 11 May 2013 22:35:30 +0000 (00:35 +0200)]
Merge remote-tracking branch 'jamrial/adpcm'

* jamrial/adpcm:
  ADPCM IMA Radical decoder
  RedSpark demuxer
  RSD demuxer
  adpcm_thp: Allow the use of extradata for the adpcm table
  ADP demuxer
  ADPCM DTK decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: fix 1000l typo
Michael Niedermayer [Sat, 11 May 2013 19:33:03 +0000 (21:33 +0200)]
ffv1enc: fix 1000l typo

Thanks to ubitux for spotting that
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1: check for malloc failure.
Michael Niedermayer [Sat, 11 May 2013 19:23:46 +0000 (21:23 +0200)]
ffv1: check for malloc failure.

Somehow i managed to loose this fix before pushing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: Fix memleak
Michael Niedermayer [Sat, 11 May 2013 19:03:54 +0000 (21:03 +0200)]
ffv1enc: Fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: dont set coded_frame
Michael Niedermayer [Sat, 11 May 2013 18:37:20 +0000 (20:37 +0200)]
ffv1enc: dont set coded_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1dec: Support frame threading with gop > 1
Michael Niedermayer [Sat, 27 Apr 2013 20:24:14 +0000 (22:24 +0200)]
ffv1dec: Support frame threading with gop > 1

This is about 20-30% faster than slice threading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: Check the return value of ffv1_common_init()
Michael Niedermayer [Sat, 11 May 2013 18:17:09 +0000 (20:17 +0200)]
ffv1enc: Check the return value of ffv1_common_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1: Switch to ThreadFrame
Michael Niedermayer [Sat, 27 Apr 2013 20:21:16 +0000 (22:21 +0200)]
ffv1: Switch to ThreadFrame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_astats: fix 64bit printf type
Michael Niedermayer [Sat, 11 May 2013 17:10:39 +0000 (19:10 +0200)]
avfilter/af_astats: fix 64bit printf type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_mp: remove unused function
Michael Niedermayer [Sat, 11 May 2013 17:08:42 +0000 (19:08 +0200)]
avfilter/vf_mp: remove unused function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_copy: silence "incompatible pointer type" warning
Michael Niedermayer [Sat, 11 May 2013 13:51:27 +0000 (15:51 +0200)]
vf_copy: silence "incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: remove duplicated abuffer docs
Stefano Sabatini [Fri, 10 May 2013 12:18:37 +0000 (14:18 +0200)]
doc/filters: remove duplicated abuffer docs

6 years agodoc/filters: sort audio filters by name
Stefano Sabatini [Fri, 10 May 2013 11:26:12 +0000 (13:26 +0200)]
doc/filters: sort audio filters by name

6 years agolavfi/curves: avoid ctx pointer indirection.
Clément Bœsch [Fri, 10 May 2013 21:47:28 +0000 (23:47 +0200)]
lavfi/curves: avoid ctx pointer indirection.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 May 2013 21:26:27 +0000 (23:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: avoid writes without necessary alignment in copy_cell()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2c299d4165cd9653153e12270971c2368551b79e'
Michael Niedermayer [Fri, 10 May 2013 21:16:09 +0000 (23:16 +0200)]
Merge commit '2c299d4165cd9653153e12270971c2368551b79e'

* commit '2c299d4165cd9653153e12270971c2368551b79e':
  x86: sbrdsp: implement SSE2 qmf_pre_shuffle

Conflicts:
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '16a4a18db089af8c432f1cdec62155000585b72c'
Michael Niedermayer [Fri, 10 May 2013 20:56:27 +0000 (22:56 +0200)]
Merge commit '16a4a18db089af8c432f1cdec62155000585b72c'

* commit '16a4a18db089af8c432f1cdec62155000585b72c':
  af_asyncts: fix offset calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'
Michael Niedermayer [Fri, 10 May 2013 20:50:57 +0000 (22:50 +0200)]
Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
  avconv: use current syntax for the scale filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoADPCM IMA Radical decoder
James Almer [Fri, 10 May 2013 19:53:50 +0000 (16:53 -0300)]
ADPCM IMA Radical decoder

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoRedSpark demuxer
James Almer [Fri, 10 May 2013 19:53:02 +0000 (16:53 -0300)]
RedSpark demuxer

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoRSD demuxer
James Almer [Fri, 10 May 2013 19:52:10 +0000 (16:52 -0300)]
RSD demuxer

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoadpcm_thp: Allow the use of extradata for the adpcm table
James Almer [Fri, 10 May 2013 18:42:40 +0000 (15:42 -0300)]
adpcm_thp: Allow the use of extradata for the adpcm table

There are several containers that support adpcm_thp (Also known as Gamecube DSP)
streams, but only thp files contain the coeff table and previous sample inside
each frame.
Some don't even contain previous sample information at all.

This change will make it easier to implement demuxers for said containers
without having to create a new decoder.

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoADP demuxer
James Almer [Fri, 3 May 2013 21:08:05 +0000 (18:08 -0300)]
ADP demuxer

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoADPCM DTK decoder
James Almer [Fri, 3 May 2013 21:07:13 +0000 (18:07 -0300)]
ADPCM DTK decoder

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agosws: add casts to silence pointer type mismatch warnings
Michael Niedermayer [Fri, 10 May 2013 18:35:49 +0000 (20:35 +0200)]
sws: add casts to silence pointer type mismatch warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable
Michael Niedermayer [Fri, 10 May 2013 18:33:04 +0000 (20:33 +0200)]
sws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable

clang did not show this one, so i missed it in the last batch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/select: set forgotten VAR_PICT_TYPE_BI
Paul B Mahol [Fri, 10 May 2013 17:37:50 +0000 (17:37 +0000)]
lavfi/select: set forgotten VAR_PICT_TYPE_BI

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: avectorscope filter
Paul B Mahol [Thu, 21 Feb 2013 10:32:59 +0000 (10:32 +0000)]
lavfi: avectorscope filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: use ceil right shift for chroma width/height.
Clément Bœsch [Thu, 9 May 2013 15:59:38 +0000 (17:59 +0200)]
lavfi: use ceil right shift for chroma width/height.

This should fix several issues with odd dimensions inputs.

lut, vflip, pad and crop video filters also need to be checked for such
issues. It's possible sws is also affected.

6 years agolavfi/anull: remove redundant lines
Paul B Mahol [Fri, 10 May 2013 09:11:51 +0000 (09:11 +0000)]
lavfi/anull: remove redundant lines

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavidec: Enable full parsing for potencoder mpeg1/2
Michael Niedermayer [Fri, 10 May 2013 14:55:06 +0000 (16:55 +0200)]
avidec: Enable full parsing for potencoder mpeg1/2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: modify names of deshake_kernel.h and unsharp_kernel.h
highgod0401 [Wed, 8 May 2013 00:53:09 +0000 (08:53 +0800)]
lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoindeo3: avoid writes without necessary alignment in copy_cell()
Janne Grunau [Thu, 9 May 2013 12:53:03 +0000 (14:53 +0200)]
indeo3: avoid writes without necessary alignment in copy_cell()

Cells starting at a position aligned to 8 pixels but wider than
4 blocks are copied with 3 blocks per loop. This creates problems on the
next loop iterations since the routine copying 2 blocks requires the
same alignment on some architectures like ARM NEON.

6 years agoFix configure --help output for some autodetected features.
Carl Eugen Hoyos [Fri, 10 May 2013 07:55:15 +0000 (09:55 +0200)]
Fix configure --help output for some autodetected features.

6 years agolavfi/avfiltergraph: fix style
Stefano Sabatini [Fri, 10 May 2013 08:16:47 +0000 (10:16 +0200)]
lavfi/avfiltergraph: fix style

6 years agolavfi/avfilter.h: fix typo
Stefano Sabatini [Fri, 10 May 2013 08:16:09 +0000 (10:16 +0200)]
lavfi/avfilter.h: fix typo

6 years agolavu/mem.h: fix typo
Stefano Sabatini [Fri, 10 May 2013 07:15:06 +0000 (09:15 +0200)]
lavu/mem.h: fix typo

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 May 2013 07:35:33 +0000 (09:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mmf: K&R formatting cosmetics

Conflicts:
libavformat/mmf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: sbrdsp: implement SSE2 qmf_pre_shuffle
Christophe Gisquet [Sun, 25 Nov 2012 08:10:36 +0000 (09:10 +0100)]
x86: sbrdsp: implement SSE2 qmf_pre_shuffle

From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoaf_asyncts: fix offset calculation
Anton Khirnov [Wed, 8 May 2013 19:44:20 +0000 (21:44 +0200)]
af_asyncts: fix offset calculation

delta is in samples, not bytes. Also the sample format is not guaranteed
to be planar.

CC:libav-stable@libav.org

6 years agoavconv: use current syntax for the scale filter
Luca Barbato [Fri, 10 May 2013 00:37:14 +0000 (02:37 +0200)]
avconv: use current syntax for the scale filter

6 years agomimic: Fix race condition
Michael Niedermayer [Thu, 9 May 2013 23:18:12 +0000 (01:18 +0200)]
mimic: Fix race condition

Fixes access after free.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws/output: silence warnings about uninitialized use of variables
Michael Niedermayer [Thu, 9 May 2013 22:48:37 +0000 (00:48 +0200)]
sws/output: silence warnings about uninitialized use of variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotakdec: simplify use of scalarproduct_int16 in decode_subframe()
Paul B Mahol [Thu, 9 May 2013 09:59:38 +0000 (09:59 +0000)]
takdec: simplify use of scalarproduct_int16 in decode_subframe()

Makes decoding little faster.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoAdd fate test for solid colour lagarith frames.
Carl Eugen Hoyos [Tue, 7 May 2013 15:46:26 +0000 (17:46 +0200)]
Add fate test for solid colour lagarith frames.

6 years agolavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.
Clément Bœsch [Tue, 7 May 2013 14:37:27 +0000 (16:37 +0200)]
lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.

6 years agolavfi/overlay: simpler up-rounded w/h computations.
Clément Bœsch [Wed, 1 May 2013 12:46:00 +0000 (14:46 +0200)]
lavfi/overlay: simpler up-rounded w/h computations.

6 years agolavu: add FF_CEIL_RSHIFT and use it in various places.
Clément Bœsch [Tue, 7 May 2013 14:31:02 +0000 (16:31 +0200)]
lavu: add FF_CEIL_RSHIFT and use it in various places.

6 years agoffadler: fix duplicate \n on errors
Michael Niedermayer [Thu, 9 May 2013 14:34:55 +0000 (16:34 +0200)]
ffadler: fix duplicate \n on errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: remove alphaextract special code
Paul B Mahol [Wed, 8 May 2013 19:48:09 +0000 (19:48 +0000)]
lavfi: remove alphaextract special code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffadler: add multifile support
Michael Niedermayer [Wed, 8 May 2013 16:11:50 +0000 (18:11 +0200)]
ffadler: add multifile support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools: Add adler32 checksum tool
Michael Niedermayer [Wed, 8 May 2013 13:35:01 +0000 (15:35 +0200)]
tools: Add adler32 checksum tool

This is about 6 times faster than md5sum on linux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agommf: K&R formatting cosmetics
Luca Barbato [Thu, 9 May 2013 08:37:31 +0000 (10:37 +0200)]
mmf: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agofate: add test for lut filter
Paul B Mahol [Wed, 8 May 2013 09:04:16 +0000 (09:04 +0000)]
fate: add test for lut filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 9 May 2013 09:55:40 +0000 (11:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Remove unused argument from QPEL_OP macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'
Michael Niedermayer [Thu, 9 May 2013 09:51:21 +0000 (11:51 +0200)]
Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'

* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
  x86: vf_yadif: Remove stray dsputil_mmx #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2'
Michael Niedermayer [Thu, 9 May 2013 09:42:31 +0000 (11:42 +0200)]
Merge commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2'

* commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2':
  x86: dsputil: Move TRANSPOSE4 macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'
Michael Niedermayer [Thu, 9 May 2013 09:35:37 +0000 (11:35 +0200)]
Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'

* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
  x86: dsputil: Move constant declarations into separate header

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ed880050edf061b38d3e39e25657c59ad9108b27'
Michael Niedermayer [Thu, 9 May 2013 09:23:27 +0000 (11:23 +0200)]
Merge commit 'ed880050edf061b38d3e39e25657c59ad9108b27'

* commit 'ed880050edf061b38d3e39e25657c59ad9108b27':
  x86: dsputil: Group all assembly constants together in constants.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '87614667606b42476f9017d79faf12b45a0bd77c'
Michael Niedermayer [Thu, 9 May 2013 09:01:14 +0000 (11:01 +0200)]
Merge commit '87614667606b42476f9017d79faf12b45a0bd77c'

* commit '87614667606b42476f9017d79faf12b45a0bd77c':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
libavcodec/x86/lpc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: fix 2 warnings about discarding const
Michael Niedermayer [Wed, 8 May 2013 21:53:31 +0000 (23:53 +0200)]
avfilter: fix 2 warnings about discarding const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: add -apad option which injects a apad filter only in the presence of video...
Michael Niedermayer [Wed, 8 May 2013 21:43:19 +0000 (23:43 +0200)]
ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: use av_freep() for forced_kf_pts
Michael Niedermayer [Wed, 8 May 2013 21:42:23 +0000 (23:42 +0200)]
ffmpeg: use av_freep() for forced_kf_pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE
Michael Niedermayer [Wed, 8 May 2013 19:59:28 +0000 (21:59 +0200)]
avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: Make enabled/disabled state available as a field of the AVFilterContext
Michael Niedermayer [Wed, 8 May 2013 19:58:40 +0000 (21:58 +0200)]
avfilter: Make enabled/disabled state available as a field of the AVFilterContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/extractplanes: packed rgb support
Paul B Mahol [Wed, 8 May 2013 18:24:39 +0000 (18:24 +0000)]
lavfi/extractplanes: packed rgb support

Signed-off-by: Paul B Mahol <onemda@gmail.com>