* qatar/master:
  compat: msvc: Make sure the object files are included when linking statically
  id3v2: check for end of file while unescaping tags

Conflicts:
	configure
	libavformat/id3v2.c

Note, ffmpeg is not affected by the out of buffer write bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>

All bugs should now be fixed in the new so the old can be droped.
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>

This moves the code to after the bitstream filters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avconv: do not send non-monotonous DTS to the muxers.

Conflicts:
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b4a5a292':
  avconv: improve -re implementation

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e3b225a4':
  matroskaenc: add an option to put the index at the start of the file

Conflicts:
	doc/muxers.texi
	libavformat/matroskaenc.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0574bc06':
  matroskaenc: cosmetics, reorder the #includes

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

* commit 'accde1bd':
  vc1_parser: Set field_order.
  mpegvideo_parser: Set field_order.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

If building libav with -MD in the cflags (for making the MSVC compiler
generate code for using a dynamically linked libc), the system headers
that declare strtod, snprintf and vsnprintf declare the functions as
imported from a DLL. To hook up wrappers of our own for these functions,
the function names are defined to avpriv_*, so that the calling code
within libav calls the wrappers instead. Since these functions
are declared to be imported from DLLs, the calling code expects to
load them from DLL import function pointers (creating references to
_imp__avpriv_strtod instead of directly to avpriv_strtod). If the
libav libraries are not built as DLLs, no such function pointers (as
the calling code expects) are created.

The linker can fix this up automatically in some cases (producing
warnings LNK4217 and LNK4049), if the object files are already
included. By telling the linker to try to include those symbols
(without the _imp prefix as the calling code ends up using),
we get the object files included, so that the linker can do the
automatic fixup. This is done via config.h, so that all (or at least
most) of the object files in our libraries force including the compat
files, to make sure they are included regardless of what files from our
static libraries actually are included.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '507b1e45':
  avcodec: Add field order information to AVCodecParserContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '566b7a20':
  x86: float dsp: butterflies_float SSE

Conflicts:
	libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b333f3a2':
  lavf-regression: use -frames instead of -t for image tests

Conflicts:
	tests/lavf-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '803d21f3':
  lavc: schedule AVCodecContext.lowres for removal on next bump.

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

* commit 'ffb068ce':
  configure: Don't do enable_deep_weak on disabled variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d810ad2':
  configure: Use a different variable name in push/popvar
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '13f57a4d':
  wav: K&R formatting cosmetics

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

* commit '6b753015':
  aac: Remove aacpsy.h header, unused since 78e65cd7
  cavs: Remove cavsdata.h header, unused since 88386fee

Conflicts:
	libavcodec/aacpsy.h
	libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bf7c3c6b':
  x86: dsputil: Move cavs and vc1-specific functions where they belong

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

* commit '93280623':
  x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
  x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9b3a04d3':
  x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Prevent a serious out of buffer bound write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Hack partially based on a commit by Michael Niedermayer <michaelni@gmx.at>
Should fix (or work around) bug 458.

Integrate the code in the packet reading function, instead of inserting
sleeps in many places.
This is simpler to follow and should work better.

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

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

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

97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.

-t 0.5 is 12.5 frames at 25 fps, which may round to either 12 or 13 on
different platforms.

It has been deprecated some time ago, but was forgotten during the last
bump.

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