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>

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>

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>

Merge commit 'f5eecee865a731d2412fde2f73c29f8f8115c499'

* commit 'f5eecee865a731d2412fde2f73c29f8f8115c499':
  ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs

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

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>

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>

Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'

* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
  avconv: make output -ss insert trim/atrim filters.

Conflicts:
Changelog
ffmpeg.c

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

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>

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>

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.

Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'

* commit '3d624420086ed3cd0c74f4510f0285968e21c117':
  avconv_opt: allocate an OutputFile before the streams.

Conflicts:
ffmpeg_opt.c

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

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>

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>

Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'

* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
  vf_setpts: cosmetics, reformat

Conflicts:
libavfilter/f_setpts.c

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

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>

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>

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>

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>

Merge commit '95220be1faac628d849a004644c0d102df0aa98b'

* commit '95220be1faac628d849a004644c0d102df0aa98b':
  indeo3: fix off by one in MV validity check

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

doc/filters: fix scale example equivalence.

scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...

doc/filters: replace hqdn3d with smartblur in timeline section.

hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).

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>

h264: assert that croping values at slice level are consistent

These values where checked before already.

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

h264_ps: check croping values

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

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>

avcodec: Drop unnecessary ff_ name prefixes from static functions

gif: Fix little endian specific code

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

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>

fate: add test for separatefields filter

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

ppc: More consistent arch initialization

fft: Remove pointless #ifdefs around function declarations

ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs

This prevents non-AltiVec-enabled compilers from choking.

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.

ppc: More consistent names for H.264 optimizations files

mpegaudiosp: More consistent names for ppc/x86 optimization files

fate: add test for swapuv filter

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

fate: add test for telecine filter

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

avconv: make output -ss insert trim/atrim filters.

This makes output -ss sample-accurate for audio and will allow further
simplication in the future.

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.

avconv_opt: allocate an OutputFile before the streams.

This way OutputFile variables like recording time can be used when
creating the streams.

lavfi: add trim and atrim filters.

lavfi: add an asetpts filter

vf_setpts: cosmetics, reformat

graphparser: only print filter arguments if they are non-NULL

af_channelmap: ensure the output channel layout is valid.

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.

vf_split: fix description

It now allows an arbitrary number of inputs, not just two.

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.

lavfi/stereo3d: add support for alternating frames input & output format

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

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.

indeo3: fix off by one in MV validity check

CC:libav-stable@libav.org

FATE: add an additional indeo3 test

It is a part of the sample that got broken by recent indeo3 changes.

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>