* commit 'd44bd7fb':
  avfilter: add documentation for needs_writable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '11d704dc':
  fate: add framepack filter test
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a7d0e7ea':
  lavfi: add framepack filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/allfilters.c
	libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa69cbc9':
  flac muxer: add option to disable writing the global header

Conflicts:
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fc9ba2fd98e_82_02785736.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The code was buggy, using the wrong variable, also it missed the case
where the packet become smaller due to sidedata/metadata being extracted
which left a few bytes uninitialized

Fixes use of uninitialized memory
Fixed: msan_uninit-mem_7f6abbe44530_6838_mewmew_vorbis_ssa.nut
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The fate test is changed because the reference file depends on the use of
non cleared data at the very
end. Alternatively we could upload a new reference file, though that would
then have to be changed every time the handling of a truncated frame changes
or theres a change to error concealment, each time adding a new file ...

Fixes use of uninitialized memory
Fixed: msan_uninit-mem_7f3c02b81363_2787_RLG2_19.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The global header is not explicitly required for playback, and
omitting it allows for simple concatenation.

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

This makes it possible to use the code with lowres
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It stored images wrong in the user provided buffers (that is you would
end up with a wrongly flipped image if you used direct rendering).
Also it used wrong dimensions as noticed by ubitux

Enable the old code unconditionally so flipping works correctly
again.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  ATRAC3+ decoder

Conflicts:
	Changelog
	configure
	libavcodec/atrac3plus.c
	libavcodec/atrac3plus.h
	libavcodec/atrac3plus_data.h
	libavcodec/atrac3plusdec.c
	libavcodec/atrac3plusdsp.c
	libavcodec/version.h

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

* commit '4c642d8d':
  x86: hpeldsp: Add missing av_cold attribute to init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b0be1ae7':
  x86: avcodec: Add a bunch of missing #includes for av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4b48201d':
  ac3tab.h: #include the correct headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes use of the example with encoders which use tha AVFrame w/h/pix_fmt fields
FFV1 is one of these codecs

We cannot easily workaround the not set fields in common code because the API
has AVFrame constant for the encoders.
Alternatives would be to fix the API or to duplicate the struct and fill in
missing fields. Or as is to require all user apps to set this correctly and
maybe simplify for that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mjpegdec: apply flipping after decoding, not before

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

* commit 'e588615d':
  hevc: fix decoding of one PU wide files

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

* commit 'a246af86':
  FATE: add MSS2 tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ca96e337':
  vp9: drop support for real (non-emulated) edges

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

* commit 'ef8c93e2':
  vp8: drop support for real (non-emulated) edges

Conflicts:
	tests/fate/vpx.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ebfe622b':
  mpegvideo: drop support for real (non-emulated) edges

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_motion.c
	libavcodec/wmv2.c

If this is slower on a major platform then it should be investigated
and potentially reverted.

See: 8fc52a5e
See: 3969b4b8Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffplay and ffprobe are read-only.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

In particular, fix trac ticket #3231.

Simplify logic, avoid multiple unnecessary alloc/free operations.

Fix PTS set on the frame when encoding, which must be specified in the
encoder timebase or this will confuse the encoder.

When muxing the packet, the PTS/DTS generated by the encoder is then
rescaled to the stream timebase.

Avoid the need of tweaking, also show how to get list of supported sample
formats.

This is simpler and removes a silly restriction on edges being present.

For those the block size may be larger than the source linesize (if the
edges are not allocated).
Signed-off-by: Anton Khirnov <anton@khirnov.net>

They are not measurably faster on x86, they might be somewhat faster on
other platforms due to missing emu edge SIMD, but the gain is not large
enough to justify the added complexity.

They are not measurably faster on x86, they might be somewhat faster on
other platforms due to missing emu edge SIMD, but the gain is not large
enough to justify the added complexity.