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

* qatar/master:
  mxfenc: switch to av_reallocp_array() and check allocation errors
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'a10c4ce2':
  aac: Forward errors properly in aac_decode_frame_int

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

* commit '71953ebc':
  aac: Check init_get_bits return value

Conflicts:
	libavcodec/aacdec.c

See: 73abc3a6Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '51fc88e7':
  avconv: improve some variable names

Conflicts:
	ffmpeg_filter.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '77cc958f':
  lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Incidentally also remove a warning.

Some code paths can call it with invalid length.

CC: libav-stable@libav.org

'filter' is too generic, since the functions in question deal with
several filters.

Also add const qualifiers to those variables.

This function should never modify the filter.

Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.
Signed-off-by: NNedeljko Babic <nbabic@mips.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

Fixes Ticket2803
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

Fixes out of array accesses
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This hopefully fixes fate-timefilter
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Fixes Ticket1897

Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This simplifies the code
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  configure: Check for GCC diagnostic pragma support inside of functions

This commit was cherry picked previously already to prevent compilation failure on a previous merge
See: 038c4f65Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'a8b19271':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

* commit '7950e519':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
	libavcodec/avpacket.c
	libavcodec/pthread.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

The actual usage of the pragma is within functions and older versions
of gcc only support the pragma outside of functions.

* commit '3a7050ff':
  build: Add _Pragma macro to disable deprecated declaration warnings

Conflicts:
	configure
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '79be2c32':
  doc/print_options: Move options headers to a saner place
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b5a13865':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '0d6fa397':
  rtmp: Add seek support

Conflicts:
	Changelog
	libavformat/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>