Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'

* commit '746ad4e0df7faf93329804e412ec53c1d929a75b':
  dct-test: Improve CPU flags struct member name

Conflicts:
	libavcodec/dct-test.c

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

* commit '24af1aa0f70362a66cda04c9d7cd012e019f5572':
  fft: Convert FFT/MDCT permutation type #defines to enums

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

* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46':
  avdevice: Give names to anonymously typedeffed structs

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

* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae':
  idct: Convert IDCT permutation #defines to an enum

Conflicts:
	libavcodec/idctdsp.c
	libavcodec/x86/cavsdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
dct-test: Reuse enum idct_permutation_type instead of duplicating it
Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'

* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
  idctdsp: prettyprinting cosmetics

Conflicts:
	libavcodec/idctdsp.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/idctdsp_init.c

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

* commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5':
  libgsm: Split decoder and encoder

Conflicts:
	libavcodec/libgsmenc.c

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

* commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b':
  x86: dnxhdenc: Eliminate some unnecessary ifdefs

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

* commit '913fa85a2c1fcd71802f7decdef5f355e0d9c757':
  dct-test: Skip indirection for MMX IDCT permutation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
hevc/sao: optimze sao implementation

- adding one extra pixel all around the frame
- do not copy when SAO is not applied

5% improvement

cherry picked from commit 10fc29fc19a12c4d8168fbe1a954b76386db12d0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hevc: fix pict_type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Write valid free atom when -moov_size is specified.

Fixes ticket #3769.
Parse dri when receiving jpg via rtp.

Based on a patch by contact at iridiummobile ru.
Fixes ticket #3780.
hevc/rext: put a warning log message instead of an error log message

cherry picked from commit 243cb99cff727d6a14c32cdff2748f6c255dbaf4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
oss_audio: Split muxer and demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
hevc: fix transquant_bypass

cherry picked from commit 4a16cb2c70728a55d2fd723aff01b13ea259c4df
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>