Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'

* commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc':
  hevc: derive partial merge list

Conflicts:
libavcodec/hevc_mvs.c

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

Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'

* commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b':
  hevc: derive partially amvp list

Conflicts:
libavcodec/hevc_mvs.c

See: bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938
See: 3ad046083119abd3b063964bd79797e9935305e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '09182b3224370e1d636631e77f201a8388766bd6'

* commit '09182b3224370e1d636631e77f201a8388766bd6':
  hevc: simplify rounding

Conflicts:
libavcodec/hevc_mvs.c

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

Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574'

* commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574':
  hevc: reorder loops

Conflicts:
libavcodec/hevc.c

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

Remove useless configure option "--enable-sram".

vp9/x86: fix bug in intra_pred_hd_32x32.

Fixes mismatch in first keyframe in sample
ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. There's still
a second mismatch a few frames into the sample.

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

x86/dca: remove unused header

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86/ttadsp: remove an unnecessary mova

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

hevc: derive partial merge list

The merge list only needs to be derived up to the merge index.

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

hevc: derive partially amvp list

When the candidate has been found, no need to derive others.

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

hevc: simplify rounding

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

hevc: reorder loops

iterate over memory in a more continuous order

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

configure: Check for nanosleep in headers as well, not only in libs

On mingw64 with c++11 support, the link libraries do contain a
nanosleep function, while it isn't exposed via the headers. Using
check_func_headers instead of a plain check_func fixes this
misdetection.

Suggested-by: Hendrik Leppkes <h.leppkes@gmail.com>
See: [FFmpeg-devel] [PATCH] fix: 'make' with mingw32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix warning if https protocol was requested but isn't available.

Check for hevc startcode when muxing into mpeg-ts.

lavu: stop exporting internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()

It was wrongly being exported and used by libavfilter.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter: ported lenscorrection filter from frei0r

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

proresenc_kostya: report buffer overflow

If the allocated size, despite best efforts, is too small, exit
with the appropriate error.

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

proresenc_kostya: remove unneeded parameters

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

Add missing initialization for AVProbeData.

This has become necessary since the new mime field was added.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

avcodec/snow: fix null pointer dereference in cleanup after allocation failure

Fixes: snowf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/huffyuvdec: fix overread checks

Fixes: ffvhuff_f.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened reader

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

lavf: stop exporting internal functions

Except for those currently used by ffserver.

Signed-off-by: James Almer <jamrial@gmail.com>
Also left some others that seemed used by applications other than ffserver

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

lavf/mpegts: remove obsolete ff_mpegts_parse_* cruft

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc/raw: remove obsolete ff_raw_pix_fmt_tags cruft

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc: stop exporting internal functions and tables

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/idctdsp: move add/put_pixels_clamped_c to header

This allows sharing them with the xvid IDCT

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

hevc: do generic validation of bitstream

After finishing parsing VPS/SPS/PPS/slice header, check remaining bits,
and if an overconsumption occurred, report invalid data.

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

hevc: add missing comma in log message.

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

avcodec/vc1dec: do not crash when flushing without an allocated frame

Fixes Ticket3837
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swresample: check av_opt_set for failure in swr_alloc_set_opts()

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

swresample: document the need to configure the context using AVOptions

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

avformat/movenc: Fix printf type

Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'

* commit '08b94f160a2c966bb83e32bde0e52246fafa2155':
  configure: Don't pass MSVC compiler options -M[TD] to armasm

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

Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'

* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
  avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

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

Remove panscan information in av_frame_copy_props() if resolution changes.

Fixes ticket #3750.

avcodec/iff: check pixfmt for rgb8 / rgbn

Fixes out of array access

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/iff: Factorize av_pix_fmt_desc_get() out

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

avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX

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

Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'

* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
  lavc: drop the av_fast_{re,m}alloc compatibility wrappers

Conflicts:
libavcodec/utils.c

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

Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'

* commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c':
  mpegts: Return proper error code on invalid input data

Conflicts:
libavformat/mpegtsenc.c

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

Merge commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847'

* commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847':
  Prepare for 11_alpha2 Release

Conflicts:
RELEASE

Not merged, as our release numbers differ

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

Merge commit 'ab0742d2f34d70415620441b7ed7da2f03a0c14f'

* commit 'ab0742d2f34d70415620441b7ed7da2f03a0c14f':
  configure: Suggest upgrading gas-preprocessor instead of just installing

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

configure: Don't pass MSVC compiler options -M[TD] to armasm

The -MD option (for enabling a dynamically linked crt) gets interpreted
as a cpp option for generating dependency information (into a file named
'-.d', when preprocessing to a pipe). We shouldn't be passing
any and all C compiler flags to armasm (which is a plain assembler,
only with cpp bolted on via gas-preprocessor), but these are the
main conflicting ones.

Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

Merge commit '9f8cf50e3be04b8e178086edaa4598826143303d'

* commit '9f8cf50e3be04b8e178086edaa4598826143303d':
  configure: Enable gas-preprocessor on all OSes but only if available

Conflicts:
configure

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

Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91'

* commit 'f4312352fc52cc47c1ba398a33f629d32a737e91':
  configure: Add probe identification of MS armasm

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/img2dec: Initialize a stack variable.

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

Merge commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86'

* commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86':
  tiff: Improve grayscale support

Conflicts:
libavcodec/tiff.c

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

Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
  avresample: Introduce AVFrame-based API

Conflicts:
libavresample/utils.c
libavutil/version.h

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

lavf/img2dec: Initialize a stack variable.

Fixes a valgrind warning about using unitialised memory.
Hopefully fixes crashes on several platforms reported through fate.

hevc_ps: verify P/T/L information

This makes the SPS parsing a little, but barely, safer.

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

lavc: drop the av_fast_{re,m}alloc compatibility wrappers

They were only needed until the bump.

avcodec/options_table: leave xvidmmx AVOption in place

Also mark it as deprecated through its help text

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

hevc_mvs: set candidate availabilities

They might be left uninitialized otherwise since 3ad04608.

Fixes ticket #3840.

Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Revert "lavc/utils: Do not require dimensions for PNG."

mplayer-specifc hacks should not be in our codebase. mplayer should fix
its own code. It is not our responsibility to work around their broken
code.

This reverts commit e8e575633faf19711910cf9caf59f7db300a9ccd.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

mpegts: Return proper error code on invalid input data

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

Prepare for 11_alpha2 Release

configure: Suggest upgrading gas-preprocessor instead of just installing

Older versions don't support all the features we test for now.

Signed-off-by: Martin Storsjö <martin@martin.st>

configure: Enable gas-preprocessor on all OSes but only if available

Signed-off-by: Martin Storsjö <martin@martin.st>

configure: Add probe identification of MS armasm

Signed-off-by: Martin Storsjö <martin@martin.st>

tiff: Improve grayscale support

Only use PAL8 if palette is present, else use GRAY8 for pixfmt.

Instead of simulating a grayscale palette, use real grayscale pixels, if no
palette is actually defined.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avresample: Introduce AVFrame-based API

hevc: fix incorrect sao buffer size

It previously used the output, cropped size, causing overreads/writes.

Fixes ticket #3839.

This issue was introduced by d249e682, which is not part of any release

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

lavfi: stop exporting internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()

lavc doesn't export ff_raw_pix_fmt_tags[] anymore.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
  mpeg: Suppress a compiler warning on callback type

Conflicts:
libavformat/mpegenc.c

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

Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'

* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
  lavc: remove obsolete and disabled avpriv functions

Conflicts:
libavcodec/dv_profile.c
libavcodec/dv_profile.h

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

Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'

* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
  Remove obsolete FF_API_REFERENCE_DTS cruft.

Conflicts:
libavformat/avformat.h

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

avcodec: disable FF_API_FAST_MALLOC

It causes build failures in some cases and the functions are provided by
libavutil so the wraper should not be needed anymore

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

Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'

* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
  Remove obsolete FF_API_PROBE_MIME cruft.

Conflicts:
libavformat/avformat.h
libavformat/format.c
libavformat/version.h

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/avio: do not include bprint.h.

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

Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'

* commit '472f9ed312ec784f7c72876b77163f4741880d05':
  Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

Conflicts:
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h

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

bump libpostproc and libswresample

this is needed / avoids some headaches  as one of their dependancies
(libavutil) was bumped

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

swresample-test: make it independant of the internal SWR_CH_MAX

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

libavfilter/af_amerge: Do not depend on SWR_CH_MAX

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

avfilter/af_pan: Do not use SWR_CH_MAX

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

avfilter/af_pan: check if the number of channels where sucessfully set

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

ffmpeg: do not use SWR_CH_MAX

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

avcodec/version: delay removial of FF_API_AUDIO_CONVERT/FF_API_AVCODEC_RESAMPLE

Some applications still use this deprecated API
Its not nice to remove it when its still in use and as long as it doesnt
cause us any work to keep it.

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

Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'

* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h

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

avcodec/version: leave old audio API

If people prefer we can also drop it

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

avcodec/flacdec: fix handling of av_samples_fill_arrays() return value

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

drop LLS1, rename LLS2 to LLS

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

avutil: delay removial of FF_API_GET_CHANNEL_LAYOUT_COMPAT

avoids fate failure of join filter

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

delay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and FF_API_OLD_ENCODE_VIDEO

This prevents a build failure when bumping.
the uses could easily be updated / removed, if people prefer.

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

avcodec: remove deprecated use of FF_IDCT_XVIDMMX

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

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

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

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

Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84'

* commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84':
  hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()

Conflicts:
libavcodec/hevc_filter.c

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

mpeg: Suppress a compiler warning on callback type

Merge commit '52a2c17ec006282f388071a831dfb21288611253'

* commit '52a2c17ec006282f388071a831dfb21288611253':
  hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()

Conflicts:
libavcodec/hevc_refs.c

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

Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'

* commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4':
  hevc_filter: move some conditions out of loops

Conflicts:
libavcodec/hevc_filter.c

This is possibly less readable than the variant used before.
Thus please take a look and if people agree its worse, dont
hesitate to revert.

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

Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943'

* commit '70211539a39ca3854f8a9e97d51dc27caa079943':
  hevc: deobfuscate slice/tile boundary handling for DBF

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c

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

Merge commit '55019715785790836f60870180e1764b06e6591c'

* commit '55019715785790836f60870180e1764b06e6591c':
  hevc_filter: drop more redundant checks

Conflicts:
libavcodec/hevc_filter.c

No change, as the removed checks where not in FFmpeg

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

Merge commit '65b8b6c476454d201348737527a1d9471f689278'

* commit '65b8b6c476454d201348737527a1d9471f689278':
  hevc_filter: drop redundant checks

Conflicts:
libavcodec/hevc_filter.c

No change as the removed checks where not in ffmpeg

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

Merge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'

* commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9':
  hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

Conflicts:
libavcodec/hevc.c

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

avfilter/dctdnoiz: remove a few indirections in idcts

No change in the generated asm.

lavc: remove obsolete and disabled avpriv functions