* commit 'dfe224f3':
  aarch64: get_cabac inline asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4506a854':
  arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* cus/stable:
  libzvbi-teletextdec: split dvb packet to slices
  libzvbi-teletextdec: use av_dlog where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  build: Use pkg-config for openjpeg

Conflicts:
	configure

Not merged / merge just for metadata at request of carl
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '565e0c6d':
  movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0092c1dd':
  matroskaenc: allow override of "writing application" tag

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

* commit '61985ad7':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8c095326':
  rv10: K&R formatting cosmetics

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

* commit 'b4d372e0':
  rv10: Forward error from rv10_decode_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Based on the x86 branchless get_cabac asm. get_cabac_noinline() gets
approximately 20% faster (no cycle counts available) compared to clang
from Xcode 5.1 beta5. More than 6% faster overall. A part of the overall
speedup might be explained by additional inlining of get_cabac().

Was missed in aeaf268e when integrating
clear_blocks into the idct.

* commit 'a8014534':
  g2meet: K&R formatting cosmetics

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

Instead of using the demux function of libzvbi to split the packet to slices
(vbi lines), lets do it ourselves.

- eliminates the 1 frame delay between page input and output
- handles non-ascending line numbers more gracefully
- enables us to return error codes on some invalid packets instead of silently
  ignoring them
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

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

Signed-off-by: Tim Walker <tdskywalker@gmail.com>

CC: libav-stable@libav.org

Signed-off-by: Tim Walker <tdskywalker@gmail.com>

CC: libav-stable@libav.org

The overread avoidance fix in cbddee1c
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org

Also sort #includes into canonical order.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

* cigaes/master:
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: more reliable test for absolute URLs.
  lavf: add subfile protocol.
  lavfi/af_atempo: clear references before returning error.
  lavd/xv: take aspect ratio into account.
  lavc/pthread: copy packet side data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3447.

ff_make_absolute_url() recognizes the "://" pattern usual
in HTTP-like protocols, but consider relative URLs starting
with just the protocol name or using the comma syntax for
options.

Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.

Fix trac ticket #3430.

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

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

Fixes generation of NaN output
Fixes: nan_example.wma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fic: Properly handle skip frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f69befe5':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

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

* commit '84cfce9f':
  matroskadec: K&R formatting cosmetics

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

This resolves a decoding failure on Intel GPUs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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