* commit 'bb789016':
  swscale: Undeprecate sws_getContext()

Conflicts:
	libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ad1ee5fa':
  avcodec: Undeprecate reordered_opaque

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a7e541c9':
  h264: fix interpretation of interleved stereo modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This removes the avcodec dependency and make the code almost twice as
fast. More to come.

The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).

Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Do not automatically map subtitles if the decoder and encoder properties are different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3819.

ff_codec_get_id() is a lavf internal function
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws_getCachedContext is not a full replacement for the function.

It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts.  There is no way to cleanly achieve this
without the field.

Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Column and row frame packing arrangements were inverted.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

* cehoyos/master:
  Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes compilation with Sun C 5.10.

This is a workaround for the issue that stream probing can use
the score of another codec type for mpeg stream autodetection.
Fixes ticket #3821.

The were wrongly being exported and used by libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b50173a4':
  movenc: fix QT chapter track character encoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'da9cc22d':
  movenc: add track title to tracks

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

* commit 'd9432789':
  movenc: remove pointless loop around BITEXACT test

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

Add padding, clear size, use the correct pointer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7b588bb6':
  svq1: do not modify the input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c7d9b473':
  cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a1599f3f':
  cdgraphics: switch to bytestream2

Conflicts:
	libavcodec/cdgraphics.c

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

It's been dead code for more than a year
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes misdetection of 664461_flac_16_44100_2.wav
Fixes Ticket3830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

An encoding ("encd") box is required to tell QT that the string is UTF8

The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.

Also, check the size of the header, avoiding invalid reads on truncated
data.

CC:libav-stable@libav.org

* commit 'ed6d9ce9':
  configure: Include the armcc build number in the compiler identification
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0 means no data consumed, so it can trigger an infinite loop in the
caller.

CC:libav-stable@libav.org

Fixes possible invalid memory accesses on corrupted data.

CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674

* commit 'cbc808d7':
  jpeg2000: enable 4 component pixel formats

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

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

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