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

* qatar/master:
  wmavoice: conceal clearly corrupted blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f5c48f5a':
  wmavoice: use init_static_data
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '04e9853a':
  wmavoice: return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7d65e960':
  iff: Do not read over the source buffer

Conflicts:
	libavcodec/iff.c

See: 2fbb37b5Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3865ba7b':
  iff: K&R formatting cosmetics

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

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

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

Simplify.

Should address trac ticket #2224.

Replace the sections "API" and "Integrating libavcodec or libavformat"
with updated / more accurate text.

See thread:
Subject: [FFmpeg-devel] [PATCH] doc/developer: merge and update sections about external development
Date: Fri,  5 Jul 2013 11:07:07 +0200

The generic code frees them already.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Should not make a difference, but its good idea.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

There's no reason we shouldn't be testing it.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

* cehoyos/master:
  Suggest recompilation with openssl or gnutls if the https protocol is not found.
  lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes non deterministic output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #2765.

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

without it FFmpeg didn't display any error message when oom event occured
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  qdm2: Conceal broken samples

See: 5ee008e0Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Even if its deprecated, it should still work correctly.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

* commit 'adadc3f2':
  qdm2: refactor joined stereo support

Conflicts:
	libavcodec/qdm2.c

See: 2b12d1ffMerged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

* commit '12576afe':
  adpcm: Write the correct number of samples for ima-dk4

Conflicts:
	libavcodec/adpcm.c

See: f18c873aMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bbf6a4aa':
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

See: 13451f55Merged-by: Michael Niedermayer <michaelni@gmx.at>