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

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

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

The bug was fixed in 1.3.0, so only perform the workaround in earlier versions.
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

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

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

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

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

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

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>