* commit '2192ff84':
  configure: Default to armasm for --toolchain=msvc when targeting arm
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'e4015b00':
  configure: Simplify, remove an unnecessary intermediate variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '6d3081e6':
  doc: Remove the now unnecessary remark about PATH and link.exe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '9e8627a1':
  asfdec: interpret the first flag in an asf packet as length flag
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '65c14801':
  checkasm: Modify report format
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f3bd3810':
  qsvdec_*: add missing CODEC_CAP_DR1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

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

if the error correction flag is not set, a packet starts with payload
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Makes it a bit more clear where each test belongs.

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

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '342b0ba5':
  configure: Only redirect strtoll to _strtoi64 if necessary

Conflicts:
	configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '5fd553d3':
  configure: Only redefine inline to __inline for msvc if necessary

Conflicts:
	configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '0cff1252':
  configure: Only add -FIstdlib.h for msvc/icl if necessary

Conflicts:
	configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '9b4b96c0':
  force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

Conflicts:
	libavcodec/dxva2_internal.h

See: c5327df8Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes cropping

Fixes Ticket4741
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.

Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.

The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This isn't necessary any longer on MSVC 2013 Update 4.
Signed-off-by: Martin Storsjö <martin@martin.st>

This isn't necessary on MSVC 2015 any longer.
Signed-off-by: Martin Storsjö <martin@martin.st>

This is only necessary on MSVC 2010/2012 (and possibly on some
ICL versions). This both avoids an extra hack on newer MSVC
versions, and better documents what the extra compiler option
is used for.
Signed-off-by: Martin Storsjö <martin@martin.st>

The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.

Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.

The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.
Signed-off-by: Martin Storsjö <martin@martin.st>

Add support for fontsize in style records. The patch uses reset to
directly change back to default style instead of using closing tags,
since we are not handling the default styles right now.
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

Github: Closes #140
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

This also switches to using a separate AVCodecContext for the inner mjpeg decoder
which is cleaner and avoids fields from being overwritten with wrong values

Fixes Ticket162
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes displaying subtitles before any CLUT has been received
Fixes Ticket153

This will of course not display these initial subtitles in the correct
color (as that is not known at that point) but they should look clean
and not corrupted
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '4d0d55cd':
  checkasm: Use LOCAL_ALIGNED

See: f467fc02
See: 9e83ac61Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes alignment issues and bus errors.
Signed-off-by: Martin Storsjö <martin@martin.st>

Silences warnings with Nasm
Signed-off-by: James Almer <jamrial@gmail.com>

Silences warnings with Nasm
Signed-off-by: James Almer <jamrial@gmail.com>

Silences warnings with Nasm
Signed-off-by: James Almer <jamrial@gmail.com>

Silences warnings with Nasm
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>