* commit 'f261e508':
  dca: Error out on missing DSYNC
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c82da343':
  pcm: always use codec->id instead of codec_id

This is not merged as we consistently use codec_id, while libav against what
the comit message might hint at mixes both in the decoder.
Its fine to use either but it should be consistent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0d973c4':
  vdpau: use the correct namespace for the union

Conflicts:
	libavcodec/vdpau.h

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

* commit 'e9d394f3':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
	libavcodec/mlpdec.c

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

* commit '2b379a92':
  mlpdsp: x86: Respect cpuflags

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

* commit '3abde1a3':
  pcx: Do not overread source buffer in pcx_rle_decode

Conflicts:
	libavcodec/pcx.c

See: 8cd1c0fe
Bytestream based system is left in place and not switched to buf+end, such switch would be
a step backward
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '170fb593':
  pcx: K&R formatting cosmetics

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

* commit 'ef5b70af':
  configure: Check for support for labels in the inline assembly

The timer code is not placed under ifdef as ours does not use labels
Merged-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

Vdp is used by libvdpau, use AVVDPAU as used for the rest.
Reported-by: Alexis Ballier <aballier@gentoo.org>

The faulty values rippled further down the codepath causing a
hard-to-track segfault in the assembly code.

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

Fixes ticket #2724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

 This should fix ticket 1378
 If we have parsed a moov atom, and found another one, just skip it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it.
Fixes ticket #2761.
Reported, analyzed and tested by trac user imavra.

Tested on a Raspberry Pi.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Use this for enabling the ppc timer.h implementation only on
assemblers that support labels in the inline assembly.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Fixes 75% of Ticket893
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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>