* commit '81ef4602':
  bktr: Use av_strerror and propagate error codes

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

* commit '3a651f59':
  dca: Move data tables from a header to an object file

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

* commit '65df9904':
  dca: Add array sizes to array declarations

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

* commit '70245853':
  g722: Add ARM NEON implementation for g722_apply_qmf()

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

* commit '73ae0a9d':
  g722: Split out computation of band->s_zero and unroll code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b16057b5':
  g722: Unroll g722_apply_qmf()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '10f16076':
  g722: Reduce number of pointers passed to g722_apply_qmf() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '67690683':
  g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The new mov code uses a temporally non sorted index since 4abfa387
and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted.
Reverting 4abfa387 and this commit would be
a alternative fix as would be various other options.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4abfa387':
  mov: Change DTS-based seek into CTS-based seek.

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

This allows sharing them with the DCA XLL extension w/o duplication.

* commit '51ca3cb6':
  xcbgrab: Use the correct geometry for the region highlight

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

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'e1a57cbb':
  ape: Use the proper variable type
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b4cda0a9':
  ogg: check memory allocations

Conflicts:
	libavformat/oggenc.c

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

* commit '53367b34':
  rtp: h264: Drop the asserts

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

* commit '3b33dfb2':
  rtp: h264: Move FU-A NAL parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f0a87479':
  rtp: h264: Move STAP-A NAL parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9a0b8d6':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b8df0b71':
  rtp: h264: Move profile_level_id parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd40815a9':
  xcbgrab: Correctly make shm optional

Conflicts:
	libavdevice/xcbgrab.c

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

* commit 'c23ccaf9':
  xcbgrab: Check for xcb-shape

Conflicts:
	configure

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

CTS-based seek is reasonable since player requests frames in output order
not coded order.

This change fixes seek to a keyframe within consecutive keyframes.
Let's say P[0|-1] and P[1|0], here x and y inside [x|y] are PTS and DTS
respectively, and both two frames are a keyframe. If you try to seek on
PTS=0, i.e. P[0|-1], you'll get P[1|0] if the demuxer is DTS based. This
is obviously undesirable.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'e21d8530':
  FATE: add a test for the SVQ1 header byte swapping

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

* commit 'd3449ac9':
  changelog: mention DXVA/HEVC and AAC ELD480

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

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

Tested with live555 RTSP server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

The feature is implemented using a transparent window and drawing
inside it a rectangle filling the whole window to highlight it.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Avoid an unsigned underflow.

Bug-Id: 1041122
CC: libav-stable@libav.org

Bug-Id: CID 1257795
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>