dct-test: Reuse enum idct_permutation_type instead of duplicating it
oss_audio: Split muxer and demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
oss_audio: use a macro to simplify ioctl() error checking

Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f'

* commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f':
  dct-test: Reuse enum idct_permutation_type instead of duplicating it

Conflicts:
	libavcodec/dct-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
swscale/swscale_internal: add needed version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws: Move fast bilinear C code into seperate file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws/x86: split mmxext fast bilinear scaler out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws: move inline asm hscale to MMX_OBJS

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
fdct: Move x86-specific declarations to a header in the x86 directory
simple_idct: Move x86-specific declarations to a header in the x86 directory
fdct: Move ppc-specific declarations to a header in the ppc directory
swscale/x86/hscale_fast_bilinear_simd: add inline asm guards

Should fix MSVC build

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

* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
  oss_audio: Split muxer and demuxer

Conflicts:
	libavdevice/Makefile
	libavdevice/oss_audio.c

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

* commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314':
  fdct: Move x86-specific declarations to a header in the x86 directory

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

* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0':
  simple_idct: Move x86-specific declarations to a header in the x86 directory

Conflicts:
	libavcodec/x86/simple_idct.c

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

* commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9':
  fdct: Move ppc-specific declarations to a header in the ppc directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
hevc: report more precise progress

There's a lag of one CTB line for SAO behind deblocking filter, except for
last line. However, once SAO has been completed on a line, all its pixels,
i.e. up to y+ctb_size are filtered and ready to be used as reference.

Without SAO, when deblocking filter finishes a CTB line, only the bottom
bottom 4 pixels may be filtered when next CTB is process by the deblocing.

The await_progess for hevc then checks whether the bottom pixels of a PU
requires access beyond that point, so the reporting should effectively
report up to the the above limits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'ffmpeg-upstream/master' into ffmpeg_patch