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

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

This should fix decoding the file in:
http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078
No i dont have the file so i cant test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Before this commit, sws_init_context() failed with an error if no scaler
was explicitly set.

Defaulting to something reasonable is better behavior.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

That's the more proper place where the scaler options should be
documented.

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>

UPDATE_CACHE isnt needed and can cause segfaults
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The W3C validator complains about these.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

* cehoyos/master:
  Avoid img_segment_size == 0 in mtv demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #3011.

* qatar/master:
  omadec: fix bitrate for ATRAC3+ streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '23d0fdcf':
  Add support for multichannel ATRAC3+ streams.

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

* commit '93370d12':
  mxfdec: set audio timebase to 1/samplerate

Conflicts:
	libavformat/mxfdec.c
	tests/ref/fate/mxf-demux
	tests/ref/seek/lavf-mxf
	tests/ref/seek/lavf-mxf_d10

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

* commit 'ff07ec14':
  pcx: Return an error on broken palette if err_detect is set to 'explode'

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

* commit 'd1d99e3b':
  pcx: Check the packet size before assuming it fits a palette
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7ba0cedb':
  rpza: Fix a buffer size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa0dd524':
  xxan: Disallow odd width

See: 77693c54
See: 8ad9b48cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fc739b3e':
  xan: Only read within the data that actually was initialized

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

* commit '30db94dc':
  xan: Use bytestream2 to limit reading to within the buffer

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

* commit '9fb0de86':
  pcx: Consume the whole packet if giving up due to missing palette

Conflicts:
	libavcodec/pcx.c

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

* commit 'a81cad8f':
  pngdec: Stop trying to decode once inflate returns Z_STREAM_END

Conflicts:
	libavcodec/pngdec.c

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

* commit 'c2319876':
  mov: Make sure the read sample count is nonnegative

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

* commit '640a2427':
  bfi: Add some very basic sanity checks for input packet sizes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9fc7184d':
  bfi: Avoid divisions by zero

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

* commit 'a9221e39':
  electronicarts: Add more sanity checking for the number of channels

Note: This check is probably unnecessary
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd07aa3f0':
  riffdec: Add sanity checks for the sample rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>