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>

Merge commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295'

* commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295':
  x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>

fate: remove forgotten transpose filter results from old system.

fate: port remaining filters to new system.

Merge of b963f021b603509b5159873de4919dec441d0782 is now complete.

fate: move kerndeint test to the new system.

fate: port our pixfmts change to fate-run.sh.

This patch is the same as 52b23cbf1c8f276136556c9e2252184b763ae1ec.

fate: add a rule for pixfmts tests.

x86: dsputil: Remove a set of pointless #ifs around function declarations

x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations

fate: fix filtfmts-test dependency after 9a5924f.

lavfi: add two opencl headers to SKIPHEADERS.

Fix make checkheaders.

fate: add bitexact flags to alphaextract/alphamerge tests.

Should fix a FATE failure.

fate: add filters dependencies to pixfmts tests.

fate: move a few simple pixfmts tests to the new system.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Remove unused macro definitions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

fate: move lavd filters tests to the new system.

Also make life test a bit more useful.

fate: remove '#' in filter parameters.

It was considered a comment.

lavfi/showwaves: fix crash in case of negative linesize

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

lavfi/showspectrum: fix crash in case of negative linesize

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

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.

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Recognize j2k as file suffix for the image2 muxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

fate: move colormatrix tests to the new system.

fate: restore our settings for drawtext/fade/unsharp.

fate: move more tests from lavfi-regression.sh to filter-video.mak.

x86: hpeldsp: Remove unused macro definitions

Recognize j2k as file suffix for the image2 muxer.

avfilter/vf_tinterlace: fix handling of not so even sizes

Fixes green bottom line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

copy_packet_data: fix memleak

This should fix gif fate memleaks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/opencl: add check version and platform

Reviewed-by: Hanspeter Niederstrasser <niederstrasser@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: fix typo in xyz2rgb matrix use.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: re-enable jpeg2000 test with rgb48le

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: Check for malloc failure of rgb0_tmp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: support xyz input

The implementation is heavily based on Matthias Buerchers and Nicolas Bertrands vf_xyz2rgb.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: remove hack to support partial convert / xyz bswaping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: temporary disable jpeg2000 test to avoid fate breakage from next commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: fix jpeg2000 on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: enable xyz12, this for now is just for swaping between le and be

Needed for fixing fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: add 16bit gbrp formats to packed_16bpc_bswap()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: extend packed_16bpc_bswap code to handle planar formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: check the maximum number of channels

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'

* commit '1b6f84a98665a15130e969fd6b460a05d50090c1':
  h264_refs: Do not print check_opcodes() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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>

lavfi/mp: remove mp=tinterlace wrapper

From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.

See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200

lavfi/transpose: apply grammar consistency fixes to transpose dir option

doc/filters: apply various general fixes to vidstabdetect docs

Adopt generally used conventions, extend and clarify explanations.

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>

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>

Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'

* commit 'c14010541035454b4d3ad08399d70423be4e0c87':
  oma: K&R formatting cosmetics

Conflicts:
libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

* commit '26a44143efb513a602542fb59aee87b1fc62af51':
  avplay: remove a warning

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'

* commit 'cf679b9476727a237c8006c685ace18acba149ab':
  hls, segment: fix splitting for audio-only streams.

Conflicts:
libavformat/hlsenc.c
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat: Add black ops audio demuxer

Fixes Ticket2064

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

aac: check the maximum number of channels

Broken bitstreams could report a larger than specified number of
channels and cause outbound writes.

CC:libav-stable@libav.org

ffv1enc: favor version 3 over 2 unless -strict -2 is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/mem: remove redundant comment from av_dynarray_add()

The function is documented in mem.h.

doc/filters: update/extend transpose filter documentation

In particular, deprecate numerical values for the dir option.

lavfi/transpose: reindent constants

lavfi/transpose: restore validity of values in range 4-7

They were lost in commit a4e0defa75b6f766aa31d80c55688d036b5fd87b.

h264_refs: Do not print check_opcodes() return value

The return value provides no useful information and removing the printing
avoids the following warning:
libavcodec/h264_refs.c:788:15: warning: 'i' may be used uninitialized in this function [-Wuninitialized]

doc/filters: readjust w/h option descriptions

doc/filters: fix grammar for removelogo filter doc sentence

fate: Invoke pixfmts lavfi tests through fate-run.sh

fate: Invoke pixdesc lavfi tests through fate-run.sh

fate: Invoke standard lavfi tests through fate-run.sh

ffv1dec: remove redundant error message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffv1dec: add code to support frame threading with gop=1 ffv1

CODEC_CAP_FRAME_THREADS is not added yet because that would
unconditionally enable it, breaking gop>1 files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffv1: Store a flag in the global header that indicates if all frames are keyframes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

astats filter

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

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>

oma: K&R formatting cosmetics

avplay: remove a warning

Set the data field in the flush_pkt to the pointer to the actual packet.
The field needs to contain a valid unique pointer, no read nor writes
are ever made to it.

hls, segment: fix splitting for audio-only streams.

CC:libav-stable@libav.org

lavfi/negate: unbreak negate alpha

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

doc/filters: remove non-existent ft_load_flags entry

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

avcodec_string: Print the used codec if it differs from the codec_id name.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec_string: remove the "(hq)" listing

printing "hq" depending on a single video encoding parameter makes
little sense

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/log: dont count&print repeats for empty strings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/intrax8: fix regression with wmv3

This also decreases dependancies between intrax8 and the outside

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/hqdn3d: remove timeline flag.

The filter stores some temporal data, which needs to be done with the
passthrough callback system when timeline is enabled. Until then,
timeline support is disabled.

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.

avutil/log: leave prefix printing state on empty input.

Fixes printing the prefix after an empty string was printed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1dec: make sure next_use_ic is set correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1dec: factor lut clean code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/write_packet: drop disabled code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer

This changes the default to avoid negative timestamps.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenc: mov/mp4 should support negative timestamps through edit lists

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mux: assert that timestamps are positive after offsetting them

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mux: use a local variable for offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mux: change avoid_negative_ts code to support later addition of AVStreams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dcaenc: silence address sanitizer warning

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

lavfi/stereo3d: avoid division when changing aspect ratio

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

lavfi/afade: fix AVOptions descriptions

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

doc/filters: fix afade 2nd example

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

lavfi/curves: add support for more rgb formats

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

lavfi: support timeline for colorbalance and colorchannelmixer

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

Merge remote-tracking branch 'qatar/master'

* commit '74685f6783e77f2545d48bd2124945ad5be39982':
  x86: Rename dsputil_rnd_template.c to rnd_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'

* commit 'c2cb01d418dd18e1cf997c038d37378d773121be':
  lavf: introduce AVFMT_TS_NEGATIVE

Conflicts:
libavformat/avformat.h
libavformat/mux.c
tests/ref/lavf/asf
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/ts
tests/ref/seek/lavf-asf
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mpg
tests/ref/seek/lavf-ts

This commit does not change the default ts behaviour, such
change will, if its done, be done separately.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

vc1dec: remove interlaced warning

While not yet bugfree, the warning is IMHO no longer appropriate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/unsharp: add opencl unsharp filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/opencl:add opencl set param function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: re-enable fate-acodec-dca2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>