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

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

* commit '14e55802':
  opusdec: properly handle mismatching configurations in multichannel streams
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fdbc544d':
  asfdec: prevent the memory leak while reading metadata
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ebaf571a':
  x86: dct: Disable dct32_float_sse on x86-64

Conflicts:
	libavcodec/x86/dct32.asm
	libavcodec/x86/dct_init.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '979cb551':
  hevc: Split the sei parsing in 3 functions

Conflicts:
	libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '043f46f5':
  hevc: Use switch instead of if-nests in decode_nal_sei_message

Conflicts:
	libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2cd841c0':
  hevc: Use a proper enum for the SEI values

Conflicts:
	libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

* commit '80ea6611':
  avcodec: h264: Extract decoder methods

Conflicts:
	libavcodec/h264_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '33dc1913':
  asfdec: remove improper assignement that caused wrong timestamps
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '78491fe8':
  asfdec: do not export empty metadata
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3e853ff7':
  des: extend av_des_init() doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd9e8b47e':
  des: add av_des_alloc()

Conflicts:
	libavutil/des.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5d8bea3b':
  xtea: add av_xtea_alloc()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'b469832d':
  rc4: extend av_rc4_init() doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ae365453':
  rc4: add av_rc4_alloc()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7a7df34c':
  blowfish: add av_blowfish_alloc()

Conflicts:
	doc/APIchanges
	libavutil/version.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'cd4d9df2':
  asfdec: free AVDictionaries properly when closing the demuxer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '90e648c5':
  fate/mp3: use the f32le format as output
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

The substreams can have different resampling delays, so an additional
level of buffering is needed to synchronize them.

Bug-Id: 876

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

There is an SSE2 implementation so the SSE version is never used. The "SSE"
version also happens to contain SSE2 instructions on x86-64.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

Commit 0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This commit adds a short description to the aac_coder option of the
AAC encoder in order to be consistent with the other options.
Generally, right now, the 'FAAC' method works fine with speech and
low broadband spectrum audio. 'Fast' is just as the name suggests.
'ANMR' still needs work and 'Twoloop', the default, works well with
every type of audio.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Makes simpler to add support for more SEI types.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

And use the correct value for decoded_picture_hash.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Extract two methods from decode_registered_user_data in order to improve
code readability. Also make the constant holding the allocation size a
64-bit unsigned integer so that the size comparison against INT_MAX makes
sense.

Bug-Id: CID1312090
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Requested-by: Ganesh Ajjanagadde <gajjanag@mit.edu> (original patch reviewer)
This reverts commit 293e25be.

Reviewed-by: Nicolas George <george@nsup.org>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

This commit removes a redundant argument from the functions in aaccoder.
The argument lambda was redundant as it was just a copy of s->lambda,
to which all functions have access to anyway. This cleans up the function
pointers a bit which is helpful as there are a lot of other search_for_*
functions under development and with them populated it gets messy.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>