* 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>

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>

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

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>

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>

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

* commit '245b76a1':
  x86: dsputil: Split inline assembly from init code

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Note, the author attribution is left in place and not removed
as it is in the merged commit.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '46bb4568':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

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

The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Always use the special filter for the first and last 3 columns (only).

Changes made in 64ed3976 slowed the filter to just under 3/4 of what it
was.  This commit restores the speed while maintaining identical output.

For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This fixes https://bugzilla.libav.org/show_bug.cgi?id=514.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: burek <burek021@gmail.com>

Apparently, this is not allowed and can trip up all sorts of things.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also use this API in framemd5.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

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

If this is explicitly disabled for win32/mingw, it should also
be disabled for cygwin, for consistency and for the same reasons
as for win32/mingw.
Signed-off-by: Martin Storsjö <martin@martin.st>

If no metadata follows MXF essence, that is essence ends with EOF,
"Operation not permitted" error was produced and a non-zero code
was returned from ffmpeg executable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>