* commit '4c81613d':
  arm: mlpdsp: handle pic offset calculation in a macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '581c7f0e':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de

Makes the code easier to read since it hides different offset
calculations for arm and thumb mode.

No significant difference in used cpu cycles on a cortex-a9.

* commit 'fccfc22d':
  libavformat: Build hevc.o when building the RTP muxer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

The RTP muxer enables the actual codepaths within sdp.c,
which depend on hevc.o since e5cfc8fd.

This fixes builds with --disable-everything --enable-muxer=rtp.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '780cd20b':
  aarch64: Use .data.rel.ro for const data with relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f963f803':
  arm: Use .data.rel.ro for const data with relocations

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

* commit '3c01039e':
  mov: further expand the list of parsed metadata tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit c00365b4
in addition to using a different section.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

we dont use FFABS(a-b) as that could result in undefined behavior if it overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Add braces when needed and drop redundant parethesis while at it.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Fix grammar and quote user-supplied values.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Should fix FFmpeg Coverity Scan issue #1257013
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

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

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

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

This ensures that the CFLAGS and LDFLAGS are actually applied.
Fixes an incorrect change introduced with the clean-up in commit
cfcaf6b3.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e2e07dba':
  mov: expand the list of parsed metadata tags

Conflicts:
	libavformat/mov.c

See: 543f3db9
See: dadf668dMerged-by: Michael Niedermayer <michaelni@gmx.at>

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

This test doesn't cover every possible issue with this function.
It covers options management only.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

* commit 'b704b648':
  mov: parse XMP metadata on demand

Conflicts:
	libavformat/isom.h
	libavformat/version.h

See: 054c506e

The default is left unchanged at enabled
We can change the default if people prefer but i do not want to do that
in a merge.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '174c5fde':
  mov: parse @PRM and @PRQ metadata tags

Conflicts:
	libavformat/mov.c

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

* commit '35384934':
  mov: cosmetics: reorder the list of tags

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

* commit '6fd91fa1':
  h264: increase MAX_SLICES to 32

The available sample decodes correctly before, but the reporter of the bug
claims that this change reduces artifacts. This is thus merged
If someone has samples that decode differently depending in the MAX_SLICES
value, please open a ticket on trac.
Also this change should be reverted if it turns out that the artifacts
that where seen had a different cause
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd0b22405':
  vf_frei0r: do not increment string if it reached the end

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

* commit '90411b33':
  Allow reading of growing avi files (currently being written)

Conflicts:
	libavformat/avidec.c
	tests/ref/fate/cvid-partial

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

* commit '4843a9c7':
  dpx: always write the image offset

Conflicts:
	libavcodec/dpxenc.c
	tests/ref/lavf/dpx

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

* commit '250e077e':
  riff: Support decoding png in avi (ImageJ)

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

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

This fixes artifacts in the last pixel of rows with some widths and pixel formats
Found-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Tested-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>