x86: rv40dsp: Use PAVGB instruction macro where appropriate
vdpau: Add missing #includes to fix standalone header compilation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
graph2dot: Fix use of deprecated API
graph2dot: Add missing #include for av_get_channel_layout_string()
avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

The function is used in a block of code that is deprecated anyway.
Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'

* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
  x86: rv40dsp: Use PAVGB instruction macro where appropriate

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

* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
	libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

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

* commit '48715285f69d70879353737d7bed049f89f58096':
  graph2dot: Fix use of deprecated API

See: 59360cd456dd038fb28134aff5d9b56302fff488
See: ecade984ac3ce5205f6276a9329e2b7bca09fa47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd'

* commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd':
  graph2dot: Add missing #include for av_get_channel_layout_string()

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

* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/c93: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/brender_pix: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/flashsv: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/flashsv: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/brender_pix: stop calling av_image_check_size() twice

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/tscc2: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/flashsv: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lsws/utils: introduce scale_algorithms array

Allow some dumb factorizations, slightly decrease spaghetti factor.
avcodec/mss1: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/flashsv: use av_freep() for tmpblock

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