* commit '7c57a582':
  jpeg2000dec: don't use deprecated PIX_FMT values
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ffba2053':
  lavfi: fix compatibility code for old vf_scale options syntax

Conflicts:
	libavfilter/avfilter.c

No change as the buggy code does not exist in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '096696ef':
  avfiltergraph: simplify inserting conversion filters.
  Clarify output of av_get_bits_per_pixel
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7cbc4cb4':
  fate: update the mmf reference
  mmf: Write metadata into an Optional Data chunk
  jpeg2000dec: Use correct printf length modifier for pointer differences

Conflicts:
	libavformat/mmf.c
	tests/ref/lavf/mmf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5d9d8461':
  vc1dec: Don't apply the loop filter on fields

Conflicts:
	tests/ref/fate/vc1_sa10143
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fe06795d':
  vc1: implement frame interlaced b-frame header parsing

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

* commit '46430fd4':
  vc1dec: Don't attempt error concealment on field pictures
  vc1dec: fieldtx is only valid for interlaced frame pictures
  aacenc: Fix erasure of surround channels
  aacenc: Fix target bitrate for twoloop quantiser search

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

* commit '7c71ada4':
  aacenc: Fix a rounding bug in aacpsy channel bitrate computation
  yadif: correct strides in filter_edges_16bit
  yadif: restore speed of the C filtering code

Conflicts:
	libavfilter/x86/vf_yadif_init.c

No change as these commits where already in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '252c0bfd':
  lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Currently it would incorrectly trigger on a string that contains a '='
but does not contain a ':', e.g. flags=<flags>.

There is now no need to explicitly pass 0:0 as width/height to scale,
those are the defaults.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

Refactoring copy_side_data into a separate function so that it can be called
in cases where side data needs to be duplicated.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This prevents use of uninitialized memory by ffmpeg later
(i_qpplus1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-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: Paul B Mahol <onemda@gmail.com>

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

Using Optional Data chunk introduced changes the hash.

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

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Also eliminate an unnecessary cast. Fixes the following warning:
jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’

This fixes use of uninitialized memory and possible out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes read of uninitialized memory.

Based on a patch by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

Signed-off-by: Martin Storsjö <martin@martin.st>

This is not implemented and doesn't work.
Signed-off-by: Martin Storsjö <martin@martin.st>

* qatar/master:
  configure: Disable PIC for cygwin just as for win32/mingw
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1399931d':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

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

The fieldtx_plane is not cleared for interlaced fields.
Signed-off-by: Martin Storsjö <martin@martin.st>

This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.
Signed-off-by: Martin Storsjö <martin@martin.st>

This fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Signed-off-by: Martin Storsjö <martin@martin.st>