Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

* commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c':
  doc/print_options: Move options headers to a saner place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure: Check for GCC diagnostic pragma support inside of functions

The actual usage of the pragma is within functions and older versions
of gcc only support the pragma outside of functions.
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  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: Michael Niedermayer <michaelni@gmx.at>
avcodec/mlp: Fix bugs in libavs warning fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

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

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* 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: 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
MAINTAINERS: add myself as maintainer for the interface code to swresample & swscale in libavfilter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mpegtsenc: add option tables_version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pnmdec: always output native pixel format

This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/pnmdec: support more pnm files

Fixes Ticket1897

Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avdevice/timefilter-test: provide more space for the printout to allow larger values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avdevice/timefilter: 2nd try at avoiding rounding issues

This hopefully fixes fate-timefilter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter: fix plane validity checks

Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers: Document previously undocumented mpegts muxer options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc/examples/filtering_audio: make const arrays also static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avdevice/dshow: make constant arrays static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avdevice/vfwcap: make constant arrays static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/graphparser: remove 256 char limit from create_filter()

Fixes Ticket2803

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MAINTAINERS: order libavutil entries alphabetically

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