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

Fixes fate issues on mingw64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'f758ea6e':
  buffersink: document special error codes returned from av_buffersink_get_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Both are required by the VP7 decoder.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  ppc: reduce overreads when loading 8 pixels in altivec dsp functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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>

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

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

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

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

This extends the exception from H264 to H264 + HEVC

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

No testcase known, this is a theoretical improvment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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.

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

They were basically the same.
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

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

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

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

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

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

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>

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

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

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

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

Conflicts:
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	doc/Doxyfile
	doc/doxy-wrapper.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	doc/Makefile

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

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

Conflicts:
	doc/Doxyfile

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

* commit '066ad249':
  h264_sei: reorder headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '304e916a':
  h264_sei: name buffering period type consistently
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '15210354':
  h264: drop outdated comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3a057670':
  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>

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

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f8c507f4':
  h264: Refactor ff_h264_decode_ref_pic_list_reordering
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Add properly formatted @example tag and fix Doxygen syntax.