* commit '4b39cc1a':
  riff: support ProRes in avi (APCN fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Changes the selection of a default device to none instead of the system default device.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

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

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

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

See http://www.itu.int/rec/R-REC-BT.709
Item 1.2, overall opto-electronic transfer characteristics at source
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Two to four times faster depending on instruction set, block size and channel count.

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

* commit 'a2448cfe':
  jpeg2000: do not compute the same value twice

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

* commit '59846452':
  svq1enc: check ff_get_buffer return value

Conflicts:
	libavcodec/svq1enc.c

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

* commit '994ab180':
  ansi: check ff_set_dimensions return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c7384664':
  avs: check ff_set_dimensions return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2b5c1efa':
  g2meet: check ff_set_dimensions return value

Conflicts:
	libavcodec/g2meet.c

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

* commit 'c6d7c201':
  indeo3: check ff_set_dimensions return value

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

* commit '8e104619':
  shorten: check for return value

Conflicts:
	libavcodec/shorten.c

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

* commit 'd5d2d6c3':
  dcadec: initialize variables before use

Conflicts:
	libavcodec/dcadec.c

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

* commit '1a9c1333':
  escape124: explicitly set get_bits1 variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ffb0598':
  mlpdec: check for negative index

Conflicts:
	libavcodec/mlpdec.c

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

* commit '6abe7eda':
  ffv1: fix out-of-bounds read

The change should be harmless but theres no out of array access before
the change
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5aa710f4':
  vorbisenc: add missing parenthesis

Conflicts:
	libavcodec/vorbisenc.c

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

* commit 'e9a6ae77':
  dpxenc: mention missing break

Conflicts:
	libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4dda5e9b':
  sunrastenc: mention missing break
Merged-by: Michael Niedermayer <michaelni@gmx.at>