swscale: x86: Consistently use lowercase function name suffixes
ac3: implement request_channel_layout.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
ac3dec: Remove write-only channel_layout field from AC3DecodeContext

Signed-off-by: Diego Biurrun <diego@biurrun.de>
avconv: add infrastructure for using hwaccels
avconv: add support for VDPAU decoding
libschroedingerenc: do not assert on values from external libraries

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
  swscale: x86: Consistently use lowercase function name suffixes

Conflicts:
	libswscale/x86/rgb2rgb.c
	libswscale/x86/swscale.c

See: 1de064e21e7f1bbdd2347ba8967089a18669fcf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'b53285462263ef8a795f0e289abd5799b4c57652'

* commit 'b53285462263ef8a795f0e289abd5799b4c57652':
  ac3: implement request_channel_layout.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec: fix channel_layout

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

* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
  ac3dec: Remove write-only channel_layout field from AC3DecodeContext

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

* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
  avconv: add infrastructure for using hwaccels

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c

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

* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

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

* qatar/master:
  libschroedingerenc: do not assert on values from external libraries

Conflicts:
	libavcodec/libschroedingerenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libvpxdec: set CODEC_CAP_DR1 for vp9

it shares vp8_decode() with vp8 which already has the flag set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libvpxenc: update cpu-used default

3 -> 1. vp8 encoding speed has improved since the initial release and 1
is a reasonable default for vp9 as well.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hnm4video: allocate frame only when theres a coded frame

Fixes memleak
Fixes: asan_heap-oob_e76bdf_2224_MOTHOO.HNM

This patch also removes the setting of palette_has_changed,
which was set on a frame that was never returned

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