Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'

* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
  doxygen: Add a number of missing function parameter descriptions

Conflicts:
libavformat/avformat.h

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

Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'

* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e':
  h264: use avpriv_request_sample for chroma_format_idc

Conflicts:
libavcodec/h264_ps.c

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

avcodec/ansi: fix integer overflow

Fixes out of array read
Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vp8dsp: evaluate CONFIG_VP7_DECODER/CONFIG_VP8_DECODER

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doxygen: Add a number of missing function parameter descriptions

tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}

Results are from a Win64 build running on an AMD FX 6300

1121 decicycles in ttafilter_process_dec_c, 16777112 runs, 104 skips
522 decicycles in ff_ttafilter_process_dec_ssse3, 16777149 runs, 67 skips
477 decicycles in ff_ttafilter_process_dec_sse4, 16777156 runs, 60 skips

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

doc/examples: remove pathes from doxy examples

This makes the examples page less cluttered

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vp9: split decode_coeff_b loop inside txsz branch.

The advantage of this is that the is32x32 division branch in
decode_coeffs_b is removed from the inner loop to outside the block
coef decoding loop in decode_coeffs. Also, it allows us to merge the
txsz branches from the block coef decoding loop, the context merge
and the context split.

vp9/x86: intra prediction SIMD.

Partially based on h264_intrapred. (I hope to eventually merge these
two intrapred implementations back together.)

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd: add list devices API
  lavd/opengl_enc_shaders: fix gray* shader

Conflicts:
doc/APIchanges

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

MAINTAINERS: add myself as vf_dejudder.c maintainer

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vp8dsp: zeroise input coefficient array after use in vp7 idct functions

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Fix project name typo

Merge for metadata only

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

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
  Move all example programs to doc/examples

Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile

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

avcodec/h264: more completely check the loop filter parameters

Fixes out of array read
Fixes: caa65cc01655505705129b677189f036-signal_sigsegv_fdcc43_2681_cov_3043376737_PPH422I5_Panasonic_A.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

h264: use avpriv_request_sample for chroma_format_idc

avcodec/msrle: use av_image_get_linesize() to calculate the linesize

Fixes out of array access
Fixes: 14a74a0a2dc67ede543f0e35d834fbbe-asan_heap-oob_49572c_556_cov_215466444_44_001_engine_room.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/APIchanges: Update for new function avio_find_protocol_name

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputs

Currently the file overwrite check does not work for paths that
contain a colon.

Use avio_find_protocol to always execute the existence check if
the file protocol is going to be used.

Fix remaining part of ticket #3249.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

lavf/avio: Introduce avio_find_protocol_name

Make it possible to find out what protocol will be chosen
for a given URL.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

doc: Fix project name typo

Move all example programs to doc/examples

Also drop support for building examples in library directories.

avcodec/dxtory: fix src size checks

Fixes integer overflow
Fixes out of array read
Fixes: d104661bb59b202df7671fb19a00ca6c-asan_heap-oob_d6429d_5066_cov_1729501105_dxtory_mic.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g2meet: validate bpp and bitmasks in the display info

Conflicts:
libavcodec/g2meet.c

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

lavd: add list devices API

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavd/opengl_enc_shaders: fix gray* shader

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

avformat/mov: fix avg_frame_rate calculation

Fixes integer overflow
Fixes Ticket3390

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

lavfi: adding dejudder filter to remove judder produced by partially telecined material.

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

g2meet: validate bpp and bitmasks in the display info

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

avcodec/alsdec: check predictor order against block length

Fixes out of array access
Fixes: abd3c041acbcb816be113455d138166b-asan_heap-oob_b11634_3707_cov_1707137151_als_05_2ch48k16b.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86/fladsp: add missing check to ff_flacdsp_init_x86()

Fixes compilation with flac decoder disabled and encoder enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY

These charts in man page are currently destroyed.

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

oggdec/vorbis: fix stream duration condition

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Prepare for 10_beta1 Release

Conflicts:
RELEASE

merge only for metadata

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

Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'

* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
  ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:
libavcodec/version.h

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

Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'

* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
  lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

Conflicts:
doc/APIchanges
libavutil/version.h

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

Merge commit '9c0e4b3395cad79c560d03d2a94595d89e017885'

* commit '9c0e4b3395cad79c560d03d2a94595d89e017885':
  ac3: update AC3PreferredStereoDownmixMode.

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

avcodec/utils: set AVFrame format unconditional

Fixes inconsistency and out of array accesses
Fixes: 10cdd7e63e7f66e3e66273939e0863dd-asan_heap-oob_1a4ff32_7078_cov_4056274555_mov_h264_aac__mp4box_frag.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/hevc: make *ps_id unsigned

Fixes integer overflow
Fixes out of array accesses
Fixes 2f65e7dbd02a12f426a423bd7bf880b4-signal_sigsegv_127c952_2793_cov_2517424539_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/hevc: Dont turn 32bit timebases into negative numbers

Fixes assertion failure
Fixes: 499f6ecaeae8e3f79a115a72c61ffd15-asan_static-oob_124a175_2792_cov_1782273879_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Prepare for 10_beta1 Release

avcodec/hevc_ps: Use get_bits_long() in decode_vui()

Fix assertion failure
Fixes: a225222ef88a0f5b1e93e1d0432debc3-asan_static-oob_124a17d_1448_cov_77608227_DBLK_E_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

ac3: update AC3PreferredStereoDownmixMode.

'11b' is reserved in the A/52 specification,
but newer encoders use it to indicate a Dolby
Pro Logic II compatible Lt/Rt downmix.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264_parser: use enum values in h264_find_frame_end()

Conflicts:
libavcodec/h264_parser.c

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

flacdsp_lpc_template: add comment to explain the CONFIG_SMALL code

I found the optimisation of 2 samples per iteration obscured the
underlying algorithm.  I had to write it out on paper and translate into
a mathematical sum to see that the two samples are unconnected.  I hope
that if anyone else is struggling to understand the code that this will
be useful.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dcadsp: scan coefficients linearly instead.

This change is inspired by x86 asm, where this frees a register.

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

dca: replace some memcpy by AV_COPY128

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

x86: float dsp: unroll SSE versions

vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.

Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.

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

h264_parser: use enum values in h264_find_frame_end()

avcodec/fic: clear slice_data

Fixes artifacts
Fixes use of freed memory

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

avcodec/fic: fix slice checks

fix integer overflows

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

avcodec/lossless_videodsp: add_hfyu_left_prediction_int16_c: fix harmless integer overflow

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

doc/doxy-wrapper.sh: fix execute flags

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

avcodec/frame_thread_encoder: warn about huffyuv limitations

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

avcodec/frame_thread_encoder: restructure huffyuv checks

This makes them similar to the other checks

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

avcodec/huffyuvenc: only allocate stats_out when it will be used

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

lavc/motion_est: remove unused variable

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/af_compand: do not leak frames on error

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/x86/lossless_videodsp: fix w type

Fixes fate issues on mingw64

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

Conflicts:
libavfilter/buffersink.h
libavfilter/buffersrc.h

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

Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'

* commit 'f758ea6e99af6ebd24bbe222898a921c222e5593':
  buffersink: document special error codes returned from av_buffersink_get_frame

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

avcodec/vp8dsp: add VP7 idct and loop filter

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc/ffv1enc: add const to silent warning

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc/tiff_common: add const to silent warnings

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED

Both are required by the VP7 decoder.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

buffersink: document special error codes returned from av_buffersink_get_frame

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: reduce overreads when loading 8 pixels in altivec dsp functions

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

Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'

* commit '3fbad00714698f59c6326edfcc63db87f525e7c0':
  utvideoenc: Enable support for multiple slices and use them

Conflicts:
libavcodec/utvideoenc.c
tests/fate/utvideo.mak

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

utvideoenc: Enable support for multiple slices and use them

The official Ut Video decoder only threads with slices, thus until
now any files encoded by the libavcodec encoder have only been
decodable with a single thread. The default slice count is now
set to subsampled_height / 120.

Also sets slices to 1 for the Ut Video encoder tests to keep them
green.

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

Merge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34'

* commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34':
  libx265: Remove redundant default param call

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

Merge commit '41836c4e306e572ecf80d5a714aaec532c7ece60'

* commit '41836c4e306e572ecf80d5a714aaec532c7ece60':
  libx265: Fix use of uninitialized input picture

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

avformat/utils: skip the MPEG-2 style dts/pts code for HEVC

This extends the exception from H264 to H264 + HEVC

Fixes Ticket3385

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

avcodec/utils: improve guess_correct_pts() by considerng mixed dts/pts use caused by NOPTSs

No testcase known, this is a theoretical improvment

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

ppc: reduce overreads when loading 8 pixels in altivec dsp functions

Altivec can only load naturally aligned vectors. To handle possibly
unaligned data a second vector is loaded from an offset of the original
location and the data is recovered through a vector permutation.
Overreads are minimal if the offset for second load points to the last
element of data. This is 7 for loading eight 8-bit pixels and overreads
are reduced from 16 bytes to 8 bytes if the pixels are 64-bit aligned.
For unaligned pixels the overread is reduced from 23 bytes to 15 bytes
in the worst case.

MAINTAINERS: add myself as ffserver maintainer

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: merge RTSP's teardown & pause routines

They were basically the same.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: cosmetics

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: fix some comments

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: factor out connection closing from handler

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: avoid useless substitution

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

doc/filters/histogram: copyedit for grammar

There were a few grammar and spelling mistakes in this filter
description. I went through it and corrected them without changing
the meaning.

utvideoenc: Enable support for multiple slices and use them

The official Ut Video decoder only threads with slices, thus until
now any files encoded by the libavcodec encoder have only been
decodable with a single thread. The default slice count is now
set to subsampled_height / 120.

Also sets slices to 1 for the Ut Video encoder tests to keep them
green.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/examples: misc Doxygen markup improvements

Conflicts:
doc/examples/muxing.c
doc/examples/transcode_aac.c

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

libx265: Remove redundant default param call

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

libx265: Fix use of uninitialized input picture

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

Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'

* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3':
  build: doxy: Include code examples in Doxygen documentation

Conflicts:
doc/Makefile

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

Merge commit '19d3127867f001d007f98bc8c5a85c5409abf788'

* commit '19d3127867f001d007f98bc8c5a85c5409abf788':
  doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh

Conflicts:
doc/Doxyfile
doc/doxy-wrapper.sh

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

Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'

* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
doc/Makefile

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

Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'

* commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492':
  Doxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh

Conflicts:
doc/Doxyfile

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

Merge commit '066ad249843bde656265b59110c2521e2b1ce131'

* commit '066ad249843bde656265b59110c2521e2b1ce131':
  h264_sei: reorder headers

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

Merge commit '304e916a92bc17385a485bec2f957e192257ddb6'

* commit '304e916a92bc17385a485bec2f957e192257ddb6':
  h264_sei: name buffering period type consistently

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

Merge commit '15210354cf27cf4e24d91f84d66cf471511ce718'

* commit '15210354cf27cf4e24d91f84d66cf471511ce718':
  h264: drop outdated comments

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

Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'

* commit '3a0576702825423abecb32627c530dbc4c0f73bc':
  h264: store current_sps_id inside the current sps

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

The current_sps_id is not removed as it used in security related code.

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

Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'

* commit '73e8fab31dc19c4371499e612856accbc00b2820':
  h264: print values in case of error

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

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

Merge commit 'f8c507f44b4c994895fc7ad954f009f61de69b1c'

* commit 'f8c507f44b4c994895fc7ad954f009f61de69b1c':
  h264: Refactor ff_h264_decode_ref_pic_list_reordering

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

doc/examples: misc Doxygen markup improvements

Add properly formatted @example tag and fix Doxygen syntax.

build: doxy: Include code examples in Doxygen documentation