* commit '5f5ada3d':
  shorten: Fix out-of-array read
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ed796fba':
  atrac3: Better name for IMDCT window initialization
  atrac3: Remove unused gain compensation tables

See: 2d528349
See: 4fb8de08Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes one testcase in Ticket2969
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

Shamelessly stolen from yadif.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Based-on: 44690dfaSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  prores: Error out only on surely incomplete ac_coeffs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '44690dfa':
  prores: Add a codepath for decoding errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e6ed8668':
  flvenc: Write proper cropping for VP6 even if there's no extradata

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

* commit 'be1e1373':
  flvenc: Support muxing VP6A as well

Conflicts:
	libavformat/flvenc.c

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

* commit '4d7aeff9':
  flvenc: Don't pretend to support muxing "plain" VP6

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

* commit '41a10f3b':
  vp6: Support cropping to AVCodecContext.width/height
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ceec6e79':
  avi: directly resync on DV in AVI read failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '756547ce':
  avi: DV in AVI must be considered single stream

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

* commit '1cac9acc':
  avi: properly fail if the dv demuxer is missing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1018a922':
  jpeg2000: Check block length

See: 914ab4cd
See: 582f5334Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '071e29af':
  vmnc: Use meaningful return values
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This keeps cropping when remuxing from F4V to FLV.
Signed-off-by: Martin Storsjö <martin@martin.st>

Handle it in the same way as VP6F, except for the codec tag.
Signed-off-by: Martin Storsjö <martin@martin.st>

The plain VP6 format is vertically flipped compared to VP6F/VP6A.
Support for the plain VP6 format was added in 09d8c0ae (which
also introduced support for muxing VP6F properly in general).
Signed-off-by: Martin Storsjö <martin@martin.st>

In these cases, there is no extradata but only the properly set
width/height values by the demuxer.

This makes sure VP6 in F4V files is cropped properly.

This is similar to what is done for H264 for letting the container
width/height override what's in the bitstream, since 30f51509.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '5e992a46':
  vmnc: Check the cursor dimensions

Conflicts:
	libavcodec/vmnc.c

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

* commit '61cd19b8':
  vmnc: Port to bytestream2

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

* commit 'a66aa0da':
  vmnc: K&R formatting cosmetics

Conflicts:
	libavcodec/vmnc.c
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

CC: libav-stable@libav.org

This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.

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