Merge commit '11c7155cce50971a38e6cebd39a3ba5a54645fae'

* commit '11c7155cce50971a38e6cebd39a3ba5a54645fae':
  dct/rdft: Add missing typedefs for context structs

Not merged, as it breaks build

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

Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'

* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
  build: Add define for SIMD extensions requiring 16-byte aligned buffers

Conflicts:
configure
libavcodec/utils.c

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

Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'

* commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3':
  libxvid: Drop PPC-specific CPU detection hack

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

Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'

* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
  http: Use a constant for the supported header size

Conflicts:
libavformat/http.c

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

dct/rdft: Add missing typedefs for context structs

Without the typedefs there can be trouble depending on #include order.

build: Add define for SIMD extensions requiring 16-byte aligned buffers

libxvid: Drop PPC-specific CPU detection hack

It is doubtful if the hack (still) works and Xvid had ten years to fix it.

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Autodetect big-endian tiff files.

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

hevc: wait proper position for tmvp

The position is either rounded or not checked, so delay the wait to
check the proper value.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Autodetect big-endian tiff files.

avcodec/mjpegdec: add pix_fmt: 0x14121200

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

avutil/opt: simplify set_string_number()

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

avutil/opt: set_string_number(): remove unneeded copy

also remove unused variables

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

http: Use a constant for the supported header size

avcodec/x86/hevcdsp_init: Fix "warning: assignment from incompatible pointer type"

hevcdsp: remove an unneeded variable in the loop filter
beta0 and beta1 will always be the same within a CU

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit 4a23d824741a289c7d2d2f2871d1e2621b63fa1b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/x86/hevc_deblock: cosmetics

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

hevc: cleanups in SSE2 and SSSE3 loop filters, use fewer instructions

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

avcodec/x86/hevc_deblock: use test instead of cmp 0

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

avcodec/x86/hevc_deblock: use of paddw instead of psllw

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

avcodec/x86/hevc_deblock: add %ifs to avoid "do nothing instructions"

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

hevc: cleaning up SSE2 and SSSE3 deblocking filters

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit b432041d7d1eca38831590f13b4e5baffff8186f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

hevc/mvs: cosmetics

cherry picked from commit 9053cd92700e939cde49ab0ea3c6917be453cab7

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

hevc/mvs: more cleanups

cherry picked from commit c4e467e79f59453783c97bc6044082edb7a6468b

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

hevc/mvs: code cleaning

cherry picked from commit 74f10da013ea71a3f6b77cdff989c4574c8a5ea2

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

hevc/mvs: simplifying derive_spatial_merge_candidates function

cherry picked from commit 99be11cf08a5628d0bb6ac7f4958bf9dd35cda62

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

hevc/mvs: remove same prediction block

cherry picked from commit 1206262ba1ef810328cadce99d5cdc0bf9285e4d

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

hevc/mvs: simplify derive_temporal_colocated_mvs

cherry picked from commit def7db60966765f4687250d766b40dbcf0f7e503

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

fate/hevc: update with new Rext bitstreams

cherry picked from commit d0924959f16d42630cfd7b3b4fce9fead60a4aa8

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

hevc/rext: remove warning for cross component prediction

cherry picked from commit fb595102593c94179502bb1967f978a1d99cc7cb

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

lavf/segment: sanitize segment end time in case last packet do not have a defined duration

In particular, avoids to set segments with duration set to 0
(e.g. segment with a single reference frame for which duration is
undefined).

lavf/segment: do not allow to create segments with no key-frames

Fix trac ticket #3749.

hevc/rext: fixing rdpcm and scaling list for Range Extension

-new rext bitstreams:
PERSIST_RPARAM_A_RExt_Sony_1.bit           ok    =
QMATRIX_A_RExt_Sony_1.bit                  ok    =
SAO_A_RExt_MediaTek_1.bit                  ok    =

(cherry picked from commit cdea029d452c521f8e5bcbe589f44b13a4011604)

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

hevc/rext: update boundary strength for chroma deblocking filter

cherry picked from commit 7d05c95ac5a63d7675bf645e74b4cf1fffff4796

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

Merge commit '78670fbf07bd03479073d4218440de4914304680'

* commit '78670fbf07bd03479073d4218440de4914304680':
  imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery

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

Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
  arm: Macroize the test for 'setend' CPU instruction support

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

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

libavformat/img2dec.c: Add a long_name to the piped image demuxers

This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.

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

Merge commit '16e6652286213014c28a9c3af70435e767d28638'

* commit '16e6652286213014c28a9c3af70435e767d28638':
  aarch64: NEON intrinsics dct_unquantize_h263.

Conflicts:
libavcodec/mpegvideo.c

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

Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

* commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d':
  configure: add support for neon intrinsics

Conflicts:
configure

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

Merge commit '389380c27915b0505fed538cd54c035c891fabd9'

* commit '389380c27915b0505fed538cd54c035c891fabd9':
  http: Do move the class instantiation in the conditional block

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

Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'

* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
  http: Provide an option to override the HTTP method

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

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
  build: Support executable only ldflags

Conflicts:
Makefile

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

Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'

* commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e':
  configure: Do not add extralibs to avresample .pc file

Conflicts:
configure

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

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>

imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery

arm: Macroize the test for 'setend' CPU instruction support

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

aarch64: NEON intrinsics dct_unquantize_h263.

Intrinsics only used on aarch64 since the existing ARMv7 NEON asm
is slightly faster (Cortex-A9, gcc-4.8, micro-benchmarks and full
decoding time).

Signed-off-by: James Yu <james.yu@linaro.org>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

configure: add support for neon intrinsics

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>

http: Do move the class instantiation in the conditional block

Remove a warning if https support is disabled.

http: Provide an option to override the HTTP method

Certain servers accept only PUT as valid method.

build: Support executable only ldflags

The options is useful to build position-independent executables on
hardened systems (e.g. Android L and Gentoo Hardened).

configure: Do not add extralibs to avresample .pc file

The library does not have external dependencies.

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>