* commit 'f5ee2300':
  configure: Factor out g722dsp module

Conflicts:
	configure
	libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a623aa00':
  configure: Factor out wmv2dsp module

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'd42191c7':
  configure: Factor out vp8dsp module

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'd4aea1aa':
  configure: Factor out vp56dsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '5cb4bdb2':
  configure: Factor out rv34dsp module

Conflicts:
	libavcodec/Makefile
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Found-by: rcombs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '575ec60e':
  configure: Factor out mss34dsp module

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '2edc77dc':
  configure: Factor out ividsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'b075869b':
  configure: Factor out flacdsp module

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '4da585ae':
  OS/2: Cleanup slib_create_def_cmd

See: 22a0387dMerged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'e1319aa1':
  libx264: Add support for the MPEG2 encoder

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/libx264.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: signal_sigabrt_7ffff70eccc9_498_divx502.avi with memlimit 1572864

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '0cf5588d':
  hq_hqa: Fix decoding when INFO section is absent
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a5354084':
  APIchanges: Mention lavfi and lavd identification symbol addition

Conflicts:
	doc/APIchanges

No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f1840b07':
  Revert "mov: Double-check that alias path is not an absolute path"

Conflicts:
	libavformat/mov.c

See: c9c7263eMerged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'b0017579':
  h264: Add support for Closed Caption export

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_sei.c

See: 8234f0e3Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Decays and attacks where by default set only for first channel
which caused poor defaults to be used which produced clipping
on any higher channel.

Reported-by: lachs0r
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Export symbols by name rather then ordinal.
Remove PROTMODE directive as it does not make sense for 32 bit library.
Also silences a warning from some linkers.
Signed-off-by: Dave Yeo <dave.r.yeo@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

This reverts commit 9286de04.
The change broke support for legit absolute file paths.

Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.

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

* cehoyos/master:
  lavfi/af_pan: Support a maximum of 64 channels.
  lswr: Allow 64 channels internally.
  lavc: Allow 64 channels internally.
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

The Soundflower input device supports 64 channels.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>