* commit 'b396bbad':
  configure: Do not add extralibs to avresample .pc file

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

* commit 'fc27e727':
  mpegts: do not export empty language tags
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Allows demuxing of iTunes files into adts while preserving gapless
metadata.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

* commit '4d2d0595':
  fate: Split audio- and video-related RealMedia targets

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

* commit '2ce53880':
  build: Conditionally compile all avcodec test programs

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

The library does not have external dependencies.

* commit '16b73280':
  build: Conditionally build and run DCT test program

Conflicts:
	libavcodec/Makefile
	libavcodec/dct-test.c
	tests/fate/libavcodec.mak
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>

* commit 'bd499d9a':
  build: Conditionally build and test iirfilter

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

Suggested-by: Andreas Cadhalpun
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

fix these strange behavior:
-af flanger=delay=10 [OK]
-af flanger=delay=1e1 [OK]
-af flanger=delay=1e+1 [Error]
-af flanger=delay=0.1 [OK]
-af flanger=delay=1e-1 [Error]
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

They are unneeded and make adding elements slightly harder as they
would need to be constantly updated
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'c3ec963d':
  mjpeg: return proper error code

See: 2ebaadf3Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '81b9bf31':
  dct-test: Move arch-specific bits into arch-specific subdirectories

Conflicts:
	libavcodec/dct-test.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'a9f3f5fa':
  Revert "tiff: support reading gray+alpha at 8 bits"

Not merged, the pix fmt its not unknown
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

This reverts commit b31d76e4 as it
uses an unkown pixel format.

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

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

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

* commit '819bb3e8':
  fate: add h264-direct-bff test
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'c39059be':
  h264: Fix direct temporal mvs for bottom-field-first poc order

Conflicts:
	libavcodec/h264_direct.c

See: ebd1c505Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b31d76e4':
  tiff: support reading gray+alpha at 8 bits

See: f746f379Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '4de8b606':
  idct: Move arm-specific declarations to a header in the arm directory
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Such files can be created using the --bff x264 option.

Sample-Id: h264_direct_temporal_mvs_bff.mkv
Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>
Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

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

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

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

* commit '9f99a5f1':
  mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong
Merged-by: NMichael Niedermayer <michaelni@gmx.at>