Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'

* commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71':
  mpegts: do not export empty language tags

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

avformat/mov: Pass through iTunSMPB from MOV.

Allows demuxing of iTunes files into adts while preserving gapless
metadata.

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

avformat/adtsenc: Optionally enable ID3 in ADTS.

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

Merge commit '4d2d0595cf9dd199c35aefef450952d209a56573'

* commit '4d2d0595cf9dd199c35aefef450952d209a56573':
  fate: Split audio- and video-related RealMedia targets

Conflicts:
tests/fate/real.mak

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

Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'

* commit '2ce53880bfeb431decdd2fc82298c0aff823ab47':
  build: Conditionally compile all avcodec test programs

Conflicts:
libavcodec/Makefile

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

Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'

* commit '16b7328058fa600d5158c84d9cc621a134eb88bc':
  build: Conditionally build and run DCT test program

Conflicts:
libavcodec/Makefile
libavcodec/dct-test.c
tests/fate/libavcodec.mak

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

mpegts: do not export empty language tags

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'

* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
  build: Conditionally build and test iirfilter

Conflicts:
libavcodec/Makefile

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

doc/APIchanges: mention FF_INPUT_BUFFER_PADDING_SIZE chage

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

fate: Split audio- and video-related RealMedia targets

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

avutil/opt: Support general expressions involving AVOption constants in set_string_number()

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

avutil: move QP2LAMBDA constant to eval

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

avutil/opt: remove dead code from set_string_number()

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

avutil/opt.c: fix bug when parsing option

fix these strange behavior:
-af flanger=delay=10 [OK]
-af flanger=delay=1e1 [OK]
-af flanger=delay=1e+1 [Error]
-af flanger=delay=0.1 [OK]
-af flanger=delay=1e-1 [Error]

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

build: Conditionally compile all avcodec test programs

build: Conditionally build and run DCT test program

build: Conditionally build and test iirfilter

avcodec/dct-test: remove fixed array sizes

They are unneeded and make adding elements slightly harder as they
would need to be constantly updated

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

Merge commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550'

* commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550':
  mjpeg: return proper error code

See: 2ebaadf35c9387610ca1eb7e94c171050562a77c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'

* commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce':
  dct-test: Move arch-specific bits into arch-specific subdirectories

Conflicts:
libavcodec/dct-test.c

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

Merge commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513'

* commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513':
  Revert "tiff: support reading gray+alpha at 8 bits"

Not merged, the pix fmt its not unknown

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

mjpeg: return proper error code

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

dct-test: Move arch-specific bits into arch-specific subdirectories

Revert "tiff: support reading gray+alpha at 8 bits"

This reverts commit b31d76e45fc3c6529dd7109e721676f3ec376d00 as it
uses an unkown pixel format.

avfilter/biquads: avoid clipping when using floating type

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

avformat/sapenc: Use av_mallocz_array()

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

avfilter/vf_owdenoise: use av_malloc_array()

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

Merge commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074'

* commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074':
  fate: add h264-direct-bff test

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

Merge commit 'c39059bea3adebcd888571d1181db215eee54495'

* commit 'c39059bea3adebcd888571d1181db215eee54495':
  h264: Fix direct temporal mvs for bottom-field-first poc order

Conflicts:
libavcodec/h264_direct.c

See: ebd1c505d22ad96e044880755ed9f4cf7cab4f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00'

* commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00':
  tiff: support reading gray+alpha at 8 bits

See: f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'

* commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755':
  idct: Move arm-specific declarations to a header in the arm directory

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

fate: add h264-direct-bff test

h264: Fix direct temporal mvs for bottom-field-first poc order

Such files can be created using the --bff x264 option.

Sample-Id: h264_direct_temporal_mvs_bff.mkv
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

tiff: support reading gray+alpha at 8 bits

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

doc: fix two spelling errors

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

idct: Move arm-specific declarations to a header in the arm directory

doc/issue_tracker: Correct sub-domain for mailing list

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

Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'

* commit '9f99a5f1d078721a30a76aec27c58805b7b87e58':
  mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

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

MAINTAINERS: Add db0 for the website

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

mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

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

matroskaenc: Don't set language to empty string, use "und"

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

fate/hevc: update fate rext tests

cherry picked from commit e6ee89e6fab60a3faa1f933b7774e819846f70c4

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

hevc: fix offset for sao temporary frame

fixes fate on alpha

cherry picked from commit 0a8ce1cbdaff7cd026bcf95ee3787bc7b4c063ee

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

doc: restore default.css

This partially reverts 9ce64ba111221a37bdd78204b67330a6120f6c50.

FATE still needs it until its design is updated to the new website
version.

doc: update the documentation generator to match the new website

Signed-off-by: db0 <db0company@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>

swscale/utils: fix rgb -> fullrange yuv

Fixes part of Ticket3785

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

swscale/utils: remove unused define

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

avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps

30000/1001 fps isnt implemented as i dont know which are the correct interleaving parameters,
pointers to the appropriate spec and page are welcome

Fixes Ticket2597

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

avformat/seek: use av_malloc_array()

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

avfilter/avfilter: use av_malloc(z)_array()

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

avcodec/hevc_ps: Check abs_delta_rps

Fixes integer overflow

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

avcodec/hevc: check nb_cpb

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

hevc: use intreadwrite

When dealing with MVs, both components may be processed at a time.

On Win64, 560 to 539 cycles for derive_spatial_merge_candidates.

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

libavutil: document side effects of macros

Signed-off-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 commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'

* commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9':
  fdct: Move ppc-specific declarations to a header in the ppc 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 '85cabb8d002f2cd100ced5cc17d87bfc9460d314'

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

Merged-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>

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>

fdct: Move ppc-specific declarations to a header in the ppc directory

simple_idct: Move x86-specific declarations to a header in the x86 directory

fdct: Move x86-specific declarations to a header in the x86 directory

sws: move inline asm hscale to MMX_OBJS

Found-by: jamrial
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 fast bilinear C code into seperate file

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

swscale/swscale_internal: add needed version.h

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>

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>

hevc: fix transquant_bypass

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

oss_audio: Split muxer and demuxer

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

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>

Parse dri when receiving jpg via rtp.

Based on a patch by contact at iridiummobile ru.
Fixes ticket #3780.

Write valid free atom when -moov_size is specified.

Fixes ticket #3769.

avcodec/hevc: fix pict_type

Signed-off-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>

Merge commit '913fa85a2c1fcd71802f7decdef5f355e0d9c757'

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

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 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'

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

Conflicts:
libavcodec/libgsmenc.c

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

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>

dct-test: Reuse enum idct_permutation_type instead of duplicating it

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>

Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'

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

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 '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 'cb44b21da1f59923be577f08c267ec270529be97'

* commit 'cb44b21da1f59923be577f08c267ec270529be97':
  dct-test: Move cpu_flags variable out of global scope

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

fate: Add test for wav Peak Envelope Chunk encoder (levl chunk).

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

Fix make checkheaders for libavcodec/proresdsp.h.

dct-test: Skip indirection for MMX IDCT permutation

x86: dnxhdenc: Eliminate some unnecessary ifdefs

libgsm: Split decoder and encoder

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

idctdsp: prettyprinting cosmetics

idct: Convert IDCT permutation #defines to an enum

Also rename the enum values to be consistent with other DCT permutations.

avdevice: Give names to anonymously typedeffed structs

Anonymous structs can cause trouble in header files, so try to
avoid them altogether as a matter of good style.

fft: Convert FFT/MDCT permutation type #defines to enums

dct-test: Improve CPU flags struct member name

dct-test: Move cpu_flags variable out of global scope

lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

smacker: remove dead code

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef'

* commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef':
  arm: cosmetics: Consistently use lowercase for shift operators

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