* commit '4a7d3837':
  buffersrc: Have function parameter names match between .c and .h file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '25a1ba81':
  log: Have function parameter names match between .c and .h file

Conflicts:
	libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This fixes two related Doxygen warnings.  Also document one parameter.

This fixes two related Doxygen warnings.

84 → 92 fps here.

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

* cigaes/master:
  lavf/lavd: version bump and APIchanges for uncoded frames.
  tools: add uncoded_frame test program.
  lavf: add uncodedframecrc test muxer.
  lavd/xv: preliminary support of uncoded frame.
  lavd/alsa: preliminary support of uncoded frame.
  lavf: add write_uncoded_frame() API.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes mp1/mp3 in mp4 misdetection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The difference to avpriv_mpa_decode_header() is that it doesnt need or modify the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '64774492':
  g2meet: make JPEG tile decoder operate on 8x8 block mask
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd6d78518':
  g2meet: factor out seeking to the chunk end

Conflicts:
	libavcodec/g2meet.c

See: 3f826039Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.

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

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

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
See: [FFmpeg-devel] Fix libssh static linkage on Windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The buffer holding the coefficients must be padded with 0 so as to use DSP
functions that may overread. Currently, the SSE2/3 versions is an example,
as they process batches of 16 bytes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  rpza: limit the number of blocks to the total remaining blocks in the frame

See: 3819db74Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a46dc497':
  rpza: move some variables to the blocks where they are used
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c7769df1':
  rpza: use fixed-width int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1218ce9':
  rpza: switch to bytestream2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Broken by: 394fb56cSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '394fb56c':
  lavf: always unref the packet passed to av_interleaved_write_frame() on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Entries that have no hash at all are not filled in
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes invalid writes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org