* cehoyos/master:
  Add wmv2 dependency to vc1 compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* 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>

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

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

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

This prevents out of array accesses

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

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>

* cigaes/master:
  lavc: copy subtitle_header when copying context.
  lavf: data muxer and demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* 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>

* commit 'e926b5ce':
  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>

* commit '7f75f2f2':
  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>

* commit '088f38a4':
  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>

* commit '38282149':
  ppc: More consistent arch initialization

Conflicts:
	libavcodec/fft.h
	libavcodec/mpegaudiodsp.c
	libavcodec/mpegaudiodsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '42b9150b':
  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>

* commit 'f5eecee8':
  ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6b110d3a':
  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>

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>

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

Conflicts:
	Changelog
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a83c0da5':
  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>

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>

${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.

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

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

Fix trac ticket #2489.

Allow to use tools designed to work with demuxers, muxers
and packets (for example ffmpeg itself) to process raw byte
streams (like aviocat).

* commit 'a1e05b04':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b4729382':
  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>

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

Conflicts:
	libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c22263d3':
  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>

* commit '949c603e':
  af_channelmap: remove now unnecessary goto
  vf_split: fix description

Conflicts:
	libavfilter/split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e036bb78':
  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>

* commit 'bda9e6d9':
  indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()

Conflicts:
	libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '95220be1':
  indeo3: fix off by one in MV validity check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This fixes returning pictures with corrupted data pointers.

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

These values where checked before already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes calling a random pointer

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

Explicitly saying it can't hurt.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>