Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'

* commit '13f57a4d881ec669b87bf82f424bfff502433060':
  wav: K&R formatting cosmetics

Conflicts:
libavformat/wavdec.c

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

Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'

* commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec':
  aac: Remove aacpsy.h header, unused since 78e65cd7726
  cavs: Remove cavsdata.h header, unused since 88386feefd

Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h

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

Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

* commit 'bf7c3c6b157f7938578f964b62cffd5e504940be':
  x86: dsputil: Move cavs and vc1-specific functions where they belong

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

Merge commit '932806232108872655556100011fe369125805d3'

* commit '932806232108872655556100011fe369125805d3':
  x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
  x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c

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

Merge commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd'

* commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd':
  x86: Move duplicated put_pixels{8|16}_mmx functions into their own file

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

lavu/opencl: fix the compile bug on linux

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

fate: Adjust filter-trim-time parameters

This should workaround rounding differences between platforms

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

mmvideo/mm_decode_intra: check horizontal coordinate too

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

mmvideo/mm_decode_inter: check horizontal coordinate too

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

wav: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

nutdec: Implement duration parsing for indexed nuts

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

aac: Remove aacpsy.h header, unused since 78e65cd7726

cavs: Remove cavsdata.h header, unused since 88386feefd

ape_decode_value_3860: check k before using it in get_bits()

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

ape_decode_value_3900: check tmpk

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: fix segfault with random output

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

lavu/opencl: fix bug of opencl options

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

lavfi/blend: merge config_input_top into config_output

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

lavfi/blend: use correct way to check number of planes

This fix crash with gray, as its marked as pseudopal,
and thus have extra plane.

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

avutil/mem: add av_memdup()

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

vmdav: unbreak decoding of samples from game The Last Dynasty

This fixes video output with samples HG060808.VMD and
HG060810.VMD. Regression since c0cbe36b18ab3e.

While here show warning if decoding is aborted for some reason.

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

vmdav: return meaningful error codes

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add wmv2 dependency to vc1 compilation.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: K&R formatting cosmetics
  ppc: Only compile AltiVec FFT assembly when AltiVec is enabled

Conflicts:
libavformat/id3v2.c

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

x86: dsputil: Move cavs and vc1-specific functions where they belong

x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c

The function does not do any rounding, so there is no point in
keeping it in a round template file.

x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c

The function is only instantiated once, so there is no point
in keeping it in a template file.

x86: Move duplicated put_pixels{8|16}_mmx functions into their own file

Add wmv2 dependency to vc1 compilation.

Fixes compilation with --disable-everything --enable-decoder=vc1.

id3v2: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

ppc: Only compile AltiVec FFT assembly when AltiVec is enabled

avcodec/ansi: Fix right/bottom end checks

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

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>

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>

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>

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>

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>

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>

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>

lavc: copy subtitle_header when copying context.

Fix trac ticket #2489.

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).

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>

avutil: doxy: Small clarification for av_buffer_create()

Explicitly saying it can't hurt.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec: doxy: Clarify what get_buffer2 must fill in buf[]

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avformat: Drop unnecessary ff_ name prefixes from static functions

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

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>